# HG changeset patch
# User Pascal Volk <neverseen@users.sourceforge.net>
# Date 1281151793 0
# Node ID ca7575401549a537eae6287f20b61d571035b2f7
# Parent  586367ee042b4ddadf69c3de253a636c1e95f7c1
VMM/config: Use common.VERSION_RE, instead of defining the regexp two times.

diff -r 586367ee042b -r ca7575401549 VirtualMailManager/config.py
--- a/VirtualMailManager/config.py	Sat Aug 07 03:17:46 2010 +0000
+++ b/VirtualMailManager/config.py	Sat Aug 07 03:29:53 2010 +0000
@@ -8,14 +8,12 @@
     VMM's configuration module for simplified configuration access.
 """
 
-import re
-
 from ConfigParser import \
      Error, MissingSectionHeaderError, NoOptionError, NoSectionError, \
      ParsingError, RawConfigParser
 from cStringIO import StringIO# TODO: move interactive stff to cli
 
-from VirtualMailManager.common import \
+from VirtualMailManager.common import VERSION_RE, \
      exec_ok, expand_path, get_unicode, lisdir, version_hex
 from VirtualMailManager.constants import CONF_ERROR
 from VirtualMailManager.errors import ConfigError, VMMError
@@ -441,8 +439,7 @@
     Returns the validated version string if it has the expected format.
     Otherwise a `ConfigValueError` will be raised.
     """
-    version_re = r'^\d+\.\d+\.(?:\d+|(?:alpha|beta|rc)\d+)$'
-    if not re.match(version_re, version_string):
+    if not VERSION_RE.match(version_string):
         raise ConfigValueError(_(u"Not a valid Dovecot version: '%s'") %
                                get_unicode(version_string))
     return version_string