40 files changed, 72 insertions, 76 deletions

diff --git a/mailman/Cgi/wsgi_app.py b/mailman/Cgi/wsgi_app.py
index 7c0d01b5e..9fa6e3d43 100644
--- a/mailman/Cgi/wsgi_app.py
+++ b/mailman/Cgi/wsgi_app.py
@@ -166,7 +166,7 @@ def print_traceback(log=None):
     except ImportError:
         traceback = None
     try:
-        from Mailman.Version import VERSION
+        from mailman.version import VERSION
     except ImportError:
         VERSION = '<undetermined>'
 
diff --git a/mailman/bin/add_members.py b/mailman/bin/add_members.py
index f7f65b953..a805cb218 100644
--- a/mailman/bin/add_members.py
+++ b/mailman/bin/add_members.py
@@ -27,7 +27,6 @@ from email.utils import parseaddr
 from mailman import Errors
 from mailman import Message
 from mailman import Utils
-from mailman import Version
 from mailman import i18n
 from mailman.app.membership import add_member
 from mailman.configuration import config
diff --git a/mailman/bin/arch.py b/mailman/bin/arch.py
index 5254179e4..d19275bdc 100644
--- a/mailman/bin/arch.py
+++ b/mailman/bin/arch.py
@@ -25,19 +25,19 @@ import optparse
 
 from locknix.lockfile import Lock
 
-from mailman import Version
 from mailman import i18n
 from mailman.Archiver.HyperArch import HyperArchive
 from mailman.Defaults import hours
 from mailman.configuration import config
 from mailman.initialize import initialize
+from mailman.version import MAILMAN_VERSION
 
 _ = i18n._
 
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %%prog [options] listname [mbox]
 
diff --git a/mailman/bin/bumpdigests.py b/mailman/bin/bumpdigests.py
index f0c12e95b..a634b636c 100644
--- a/mailman/bin/bumpdigests.py
+++ b/mailman/bin/bumpdigests.py
@@ -20,9 +20,9 @@ import optparse
 
 from mailman import Errors
 from mailman import MailList
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
+from mailman.version import MAILMAN_VERSION
 
 # Work around known problems with some RedHat cron daemons
 import signal
@@ -31,7 +31,7 @@ signal.signal(signal.SIGCHLD, signal.SIG_DFL)
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options] [listname ...]
 
diff --git a/mailman/bin/change_pw.py b/mailman/bin/change_pw.py
index f82b7e014..3fa6dbd8d 100644
--- a/mailman/bin/change_pw.py
+++ b/mailman/bin/change_pw.py
@@ -25,9 +25,9 @@ from mailman import Errors
 from mailman import MailList
 from mailman import Message
 from mailman import Utils
-from mailman import Version
 from mailman import i18n
 from mailman.configuration import config
+from mailman.version import MAILMAN_VERSION
 
 _ = i18n._
 SPACE = ' '
@@ -35,7 +35,7 @@ SPACE = ' '
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %%prog [options]
 
diff --git a/mailman/bin/check_perms.py b/mailman/bin/check_perms.py
index a149aa03a..1d30078a5 100644
--- a/mailman/bin/check_perms.py
+++ b/mailman/bin/check_perms.py
@@ -24,9 +24,9 @@ import optparse
 
 from stat import *
 
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
+from mailman.version import MAILMAN_VERSION
 
 
 # XXX Need to check the archives/private/*/database/* files
@@ -348,7 +348,7 @@ def checkdata():
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options]
 
diff --git a/mailman/bin/checkdbs.py b/mailman/bin/checkdbs.py
index a39b9c4aa..4174e3038 100644
--- a/mailman/bin/checkdbs.py
+++ b/mailman/bin/checkdbs.py
@@ -24,10 +24,10 @@ from email.Charset import Charset
 from mailman import MailList
 from mailman import Message
 from mailman import Utils
-from mailman import Version
 from mailman import i18n
 from mailman.app.requests import handle_request
 from mailman.configuration import config
+from mailman.version import MAILMAN_VERSION
 
 _ = i18n._
 
@@ -41,7 +41,7 @@ now = time.time()
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options]
 
diff --git a/mailman/bin/cleanarch.py b/mailman/bin/cleanarch.py
index 96b6144ef..64e7566ee 100644
--- a/mailman/bin/cleanarch.py
+++ b/mailman/bin/cleanarch.py
@@ -22,8 +22,8 @@ import sys
 import mailbox
 import optparse
 
-from mailman import Version
 from mailman.i18n import _
+from mailman.version import MAILMAN_VERSION
 
 
 cre = re.compile(mailbox.UnixMailbox._fromlinepattern)
@@ -35,7 +35,7 @@ fre = re.compile(r'[\041-\071\073-\176]+')
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options] < inputfile > outputfile
 
diff --git a/mailman/bin/config_list.py b/mailman/bin/config_list.py
index fe905cd91..f56e28f7a 100644
--- a/mailman/bin/config_list.py
+++ b/mailman/bin/config_list.py
@@ -23,9 +23,9 @@ import optparse
 from mailman import Errors
 from mailman import MailList
 from mailman import Utils
-from mailman import Version
 from mailman import i18n
 from mailman.configuration import config
+from mailman.version import MAILMAN_VERSION
 
 _ = i18n._
 
@@ -35,7 +35,7 @@ nonasciipat = re.compile(r'[\x80-\xff]')
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options] listname
 
diff --git a/mailman/bin/disabled.py b/mailman/bin/disabled.py
index 102ad7251..c5840d842 100644
--- a/mailman/bin/disabled.py
+++ b/mailman/bin/disabled.py
@@ -23,11 +23,11 @@ from mailman import Errors
 from mailman import MailList
 from mailman import MemberAdaptor
 from mailman import Pending
-from mailman import Version
 from mailman import loginit
 from mailman.Bouncer import _BounceInfo
 from mailman.configuration import config
 from mailman.i18n import _
+from mailman.version import MAILMAN_VERSION
 
 
 # Work around known problems with some RedHat cron daemons
@@ -57,7 +57,7 @@ def who_callback(option, opt, value, parser):
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options]
 
diff --git a/mailman/bin/export.py b/mailman/bin/export.py
index b46e6fc03..8a9a1bdb2 100644
--- a/mailman/bin/export.py
+++ b/mailman/bin/export.py
@@ -31,13 +31,14 @@ from xml.sax.saxutils import escape
 from mailman import Defaults
 from mailman import Errors
 from mailman import MemberAdaptor
-from mailman import Version
 from mailman.MailList import MailList
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.initialize import initialize
+from mailman.version import MAILMAN_VERSION
 
-SPACE           = ' '
+
+SPACE = ' '
 
 TYPES = {
     Defaults.Toggle         : 'bool',
diff --git a/mailman/bin/find_member.py b/mailman/bin/find_member.py
index 68082d05f..e98e5b6b3 100644
--- a/mailman/bin/find_member.py
+++ b/mailman/bin/find_member.py
@@ -21,9 +21,9 @@ import optparse
 
 from mailman import Errors
 from mailman import MailList
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
+from mailman.version import MAILMAN_VERSION
 
 
 AS_MEMBER   = 0x01
@@ -32,7 +32,7 @@ AS_OWNER    = 0x02
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options] regex [regex ...]
 
diff --git a/mailman/bin/gate_news.py b/mailman/bin/gate_news.py
index 71db6e249..2b30ae659 100644
--- a/mailman/bin/gate_news.py
+++ b/mailman/bin/gate_news.py
@@ -32,11 +32,11 @@ from locknix import lockfile
 from mailman import MailList
 from mailman import Message
 from mailman import Utils
-from mailman import Version
 from mailman import loginit
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.queue import Switchboard
+from mailman.version import MAILMAN_VERSION
 
 # Work around known problems with some RedHat cron daemons
 import signal
@@ -52,7 +52,7 @@ class _ContinueLoop(Exception):
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options]
 
diff --git a/mailman/bin/genaliases.py b/mailman/bin/genaliases.py
index 227500539..823361b38 100644
--- a/mailman/bin/genaliases.py
+++ b/mailman/bin/genaliases.py
@@ -21,15 +21,15 @@ import sys
 import optparse
 
 from mailman import MailList
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.initialize import initialize
+from mailman.version import MAILMAN_VERSION
 
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options]
 
diff --git a/mailman/bin/import.py b/mailman/bin/import.py
index 12a41961d..68b182183 100644
--- a/mailman/bin/import.py
+++ b/mailman/bin/import.py
@@ -29,11 +29,11 @@ from mailman import Defaults
 from mailman import Errors
 from mailman import MemberAdaptor
 from mailman import Utils
-from mailman import Version
 from mailman import passwords
 from mailman.MailList import MailList
 from mailman.i18n import _
 from mailman.initialize import initialize
+from mailman.version import MAILMAN_VERSION
 
 
 OPTS = None
@@ -264,7 +264,7 @@ def create(all_listdata):
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options]
 
diff --git a/mailman/bin/inject.py b/mailman/bin/inject.py
index 8c4613756..3713a1017 100644
--- a/mailman/bin/inject.py
+++ b/mailman/bin/inject.py
@@ -23,7 +23,6 @@ import sys
 from email import message_from_string
 
 from mailman import Utils
-from mailman import Version
 from mailman.Message import Message
 from mailman.configuration import config
 from mailman.i18n import _
diff --git a/mailman/bin/list_lists.py b/mailman/bin/list_lists.py
index 805ef725c..68a5190b9 100644
--- a/mailman/bin/list_lists.py
+++ b/mailman/bin/list_lists.py
@@ -16,7 +16,6 @@
 # USA.
 
 from mailman import Defaults
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.options import Options
diff --git a/mailman/bin/list_members.py b/mailman/bin/list_members.py
index f13246ba9..2ddfbbef1 100644
--- a/mailman/bin/list_members.py
+++ b/mailman/bin/list_members.py
@@ -21,7 +21,6 @@ from email.Utils import formataddr
 
 from mailman import Errors
 from mailman import Utils
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.interfaces import DeliveryStatus
diff --git a/mailman/bin/list_owners.py b/mailman/bin/list_owners.py
index 89f031f0c..3d501abf6 100644
--- a/mailman/bin/list_owners.py
+++ b/mailman/bin/list_owners.py
@@ -18,16 +18,16 @@
 import sys
 import optparse
 
-from mailman import Version
 from mailman.MailList import MailList
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.initialize import initialize
+from mailman.version import MAILMAN_VERSION
 
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options] [listname ...]
 
diff --git a/mailman/bin/mailmanctl.py b/mailman/bin/mailmanctl.py
index ebde2bbe1..24e8e0d1f 100644
--- a/mailman/bin/mailmanctl.py
+++ b/mailman/bin/mailmanctl.py
@@ -29,10 +29,10 @@ import logging
 
 from optparse import OptionParser
 
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.initialize import initialize
+from mailman.version import MAILMAN_VERSION
 
 
 COMMASPACE = ', '
@@ -43,7 +43,7 @@ parser = None
 
 
 def parseargs():
-    parser = OptionParser(version=Version.MAILMAN_VERSION,
+    parser = OptionParser(version=MAILMAN_VERSION,
                           usage=_("""\
 Primary start-up and shutdown script for Mailman's qrunner daemon.
 
diff --git a/mailman/bin/make_instance.py b/mailman/bin/make_instance.py
index 750707906..27c42557e 100644
--- a/mailman/bin/make_instance.py
+++ b/mailman/bin/make_instance.py
@@ -30,7 +30,7 @@ from pkg_resources import resource_string
 from string import Template
 
 from mailman import Defaults
-from mailman.Version import MAILMAN_VERSION
+from mailman.version import MAILMAN_VERSION
 from mailman.i18n import _
 
 
diff --git a/mailman/bin/mmsitepass.py b/mailman/bin/mmsitepass.py
index c9a5f7ade..73927c5a6 100644
--- a/mailman/bin/mmsitepass.py
+++ b/mailman/bin/mmsitepass.py
@@ -20,16 +20,16 @@ import getpass
 import optparse
 
 from mailman import Utils
-from mailman import Version
 from mailman import passwords
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.initialize import initialize
+from mailman.version import MAILMAN_VERSION
 
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options] [password]
 
diff --git a/mailman/bin/nightly_gzip.py b/mailman/bin/nightly_gzip.py
index 5a91a260d..ef20b3b90 100644
--- a/mailman/bin/nightly_gzip.py
+++ b/mailman/bin/nightly_gzip.py
@@ -25,15 +25,15 @@ except ImportError:
     sys.exit(0)
 
 from mailman import MailList
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.initialize import initialize
+from mailman.version import MAILMAN_VERSION
 
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options] [listname ...]
 
diff --git a/mailman/bin/senddigests.py b/mailman/bin/senddigests.py
index 8c5ca4f64..637f385e8 100644
--- a/mailman/bin/senddigests.py
+++ b/mailman/bin/senddigests.py
@@ -20,9 +20,9 @@ import sys
 import optparse
 
 from mailman import MailList
-from mailman import Version
 from mailman.i18n import _
 from mailman.initialize import initialize
+from mailman.version import MAILMAN_VERSION
 
 # Work around known problems with some RedHat cron daemons
 import signal
@@ -31,7 +31,7 @@ signal.signal(signal.SIGCHLD, signal.SIG_DFL)
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options]
 
diff --git a/mailman/bin/set_members.py b/mailman/bin/set_members.py
index e72940a17..a97b13df8 100644
--- a/mailman/bin/set_members.py
+++ b/mailman/bin/set_members.py
@@ -22,13 +22,13 @@ import optparse
 
 from mailman import Message
 from mailman import Utils
-from mailman import Version
 from mailman import i18n
 from mailman import passwords
 from mailman.app.membership import add_member
 from mailman.configuration import config
 from mailman.initialize import initialize
 from mailman.interfaces import DeliveryMode
+from mailman.version import MAILMAN_VERSION
 
 
 _ = i18n._
@@ -42,7 +42,7 @@ DELIVERY_MODES = {
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options] csv-file
 
diff --git a/mailman/bin/show_config.py b/mailman/bin/show_config.py
index fc6554967..a41f7422b 100644
--- a/mailman/bin/show_config.py
+++ b/mailman/bin/show_config.py
@@ -20,11 +20,10 @@ import sys
 import pprint
 import optparse
 
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
+from mailman.version import MAILMAN_VERSION
 
-__i18_templates__ = True
 
 # List of names never to show even if --verbose
 NEVER_SHOW = ['__builtins__', '__doc__']
@@ -32,7 +31,7 @@ NEVER_SHOW = ['__builtins__', '__doc__']
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %%prog [options] [pattern ...]
 
diff --git a/mailman/bin/show_qfiles.py b/mailman/bin/show_qfiles.py
index bffc4471f..02ae1bf79 100644
--- a/mailman/bin/show_qfiles.py
+++ b/mailman/bin/show_qfiles.py
@@ -19,11 +19,9 @@ import sys
 import optparse
 from cPickle import load
 
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
-
-__i18_templates__ = True
+from mailman.version import MAILMAN_VERSION
 
 
 
diff --git a/mailman/bin/testall.py b/mailman/bin/testall.py
index 9e9dd543d..e4e2cc140 100644
--- a/mailman/bin/testall.py
+++ b/mailman/bin/testall.py
@@ -31,10 +31,11 @@ import tempfile
 import unittest
 import pkg_resources
 
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.initialize import initialize_1, initialize_2
+from mailman.version import MAILMAN_VERSION
+
 
 basedir = None
 
@@ -52,7 +53,7 @@ def v_callback(option, opt, value, parser):
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options] [tests]
 
diff --git a/mailman/bin/unshunt.py b/mailman/bin/unshunt.py
index 53e485ee3..8e3c25d34 100644
--- a/mailman/bin/unshunt.py
+++ b/mailman/bin/unshunt.py
@@ -18,15 +18,15 @@
 import sys
 import optparse
 
-from mailman import Version
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.queue import Switchboard
+from mailman.version import MAILMAN_VERSION
 
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %%prog [options] [directory]
 
diff --git a/mailman/bin/update.py b/mailman/bin/update.py
index b86793c3f..af6c5d4c7 100644
--- a/mailman/bin/update.py
+++ b/mailman/bin/update.py
@@ -32,7 +32,7 @@ from mailman import MailList
 from mailman import Message
 from mailman import Pending
 from mailman import Utils
-from mailman import Version
+from mailman import version
 from mailman.MemberAdaptor import BYBOUNCE, ENABLED
 from mailman.OldStyleMemberships import OldStyleMemberships
 from mailman.Queue.Switchboard import Switchboard
@@ -47,7 +47,7 @@ NOTFRESH = -1
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=version.MAILMAN_VERSION,
                                    usage=_("""\
 Perform all necessary upgrades.
 
@@ -77,7 +77,7 @@ def calcversions():
     #
     # See if we stored the last updated version
     lastversion = None
-    thisversion = Version.HEX_VERSION
+    thisversion = version.HEX_VERSION
     try:
         fp = open(os.path.join(config.DATA_DIR, 'last_mailman_version'))
         data = fp.read()
diff --git a/mailman/bin/version.py b/mailman/bin/version.py
index 1bfe8e98c..200d157d5 100644
--- a/mailman/bin/version.py
+++ b/mailman/bin/version.py
@@ -17,13 +17,13 @@
 
 import optparse
 
-from mailman import Version
+from mailman import version
 from mailman.i18n import _
 
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=version.MAILMAN_VERSION,
                                    usage=_("""\
 %prog
 
@@ -38,7 +38,7 @@ Print the Mailman version and exit."""))
 def main():
     parser, opts, args = parseargs()
     # Yes, this is kind of silly
-    print _('Using $Version.MAILMAN_VERSION ($Version.CODENAME)')
+    print _('Using $version.MAILMAN_VERSION ($version.CODENAME)')
 
 
 
diff --git a/mailman/bin/withlist.py b/mailman/bin/withlist.py
index 2b312a87c..71a6274f0 100644
--- a/mailman/bin/withlist.py
+++ b/mailman/bin/withlist.py
@@ -20,11 +20,12 @@ import sys
 import optparse
 
 from mailman import Errors
-from mailman import Version
 from mailman import interact
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.initialize import initialize
+from mailman.version import MAILMAN_VERSION
+
 
 LAST_MLIST  = None
 VERBOSE     = True
@@ -55,7 +56,7 @@ def do_list(listname, args, func):
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options] listname [args ...]
 
diff --git a/mailman/configuration.py b/mailman/configuration.py
index 83fadac5d..0c2cff174 100644
--- a/mailman/configuration.py
+++ b/mailman/configuration.py
@@ -23,7 +23,7 @@ import errno
 
 from mailman import Defaults
 from mailman import Errors
-from mailman import Version
+from mailman import version
 from mailman.languages import LanguageManager
 
 SPACE = ' '
@@ -49,7 +49,7 @@ class Configuration(object):
         self._reverse = None
         self.qrunners = {}
         self.qrunner_shortcuts = {}
-        self.QFILE_SCHEMA_VERSION = Version.QFILE_SCHEMA_VERSION
+        self.QFILE_SCHEMA_VERSION = version.QFILE_SCHEMA_VERSION
 
     def load(self, filename=None):
         join = os.path.join
diff --git a/mailman/database/__init__.py b/mailman/database/__init__.py
index 1f73071c0..e128bf2fa 100644
--- a/mailman/database/__init__.py
+++ b/mailman/database/__init__.py
@@ -30,7 +30,7 @@ from string import Template
 from urlparse import urlparse
 from zope.interface import implements
 
-import mailman.Version
+import mailman.version
 import mailman.database
 
 from mailman.configuration import config
@@ -126,9 +126,9 @@ class StockDatabase:
         if not v:
             # Database has not yet been initialized
             v = Version(component=u'schema',
-                        version=mailman.Version.DATABASE_SCHEMA_VERSION)
+                        version=mailman.version.DATABASE_SCHEMA_VERSION)
             store.add(v)
-        elif v.version <> mailman.Version.DATABASE_SCHEMA_VERSION:
+        elif v.version <> mailman.version.DATABASE_SCHEMA_VERSION:
             # XXX Update schema
             raise SchemaVersionMismatchError(v.version)
         self.store = store
diff --git a/mailman/htmlformat.py b/mailman/htmlformat.py
index fa3f4d1a4..e1a6d5b84 100644
--- a/mailman/htmlformat.py
+++ b/mailman/htmlformat.py
@@ -23,7 +23,7 @@ for python and, recursively, for nested HTML formatting objects.
 
 from Mailman import Defaults
 from Mailman import Utils
-from Mailman import Version
+from Mailman import version
 from Mailman.configuration import config
 from Mailman.i18n import _
 
@@ -606,7 +606,7 @@ def MailmanLogo():
         def logo(file):
             return config.IMAGE_LOGOS + file
         mmlink = '<img src="%s" alt="Delivered by Mailman" border=0>' \
-                 '<br>version %s' % (logo(DELIVERED_BY), Version.VERSION)
+                 '<br>version %s' % (logo(DELIVERED_BY), version.VERSION)
         pylink = '<img src="%s" alt="Python Powered" border=0>' % \
                  logo(PYTHON_POWERED)
         gnulink = '<img src="%s" alt="GNU\'s Not Unix" border=0>' % \
@@ -614,7 +614,7 @@ def MailmanLogo():
         t.AddRow([mmlink, pylink, gnulink])
     else:
         # use only textual links
-        version = Version.VERSION
+        version = version.VERSION
         mmlink = Link(config.MAILMAN_URL,
                       _('Delivered by Mailman<br>version %(version)s'))
         pylink = Link(PYTHON_URL, _('Python Powered'))
diff --git a/mailman/interfaces/database.py b/mailman/interfaces/database.py
index 706613ba0..4565c4719 100644
--- a/mailman/interfaces/database.py
+++ b/mailman/interfaces/database.py
@@ -25,8 +25,8 @@ Mailman's back end.
 
 from zope.interface import Interface, Attribute
 
-from mailman.Version import DATABASE_SCHEMA_VERSION
 from mailman.interfaces.errors import MailmanError
+from mailman.version import DATABASE_SCHEMA_VERSION
 
 
 
diff --git a/mailman/options.py b/mailman/options.py
index 62a9c12fb..317ff8d8d 100644
--- a/mailman/options.py
+++ b/mailman/options.py
@@ -29,7 +29,7 @@ import sys
 from copy import copy
 from optparse import Option, OptionParser, OptionValueError
 
-from mailman.Version import MAILMAN_VERSION
+from mailman.version import MAILMAN_VERSION
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.initialize import initialize
diff --git a/mailman/pipeline/cook_headers.py b/mailman/pipeline/cook_headers.py
index 2cf156b2c..c237c171a 100644
--- a/mailman/pipeline/cook_headers.py
+++ b/mailman/pipeline/cook_headers.py
@@ -30,11 +30,11 @@ from email.Utils import parseaddr, formataddr, getaddresses
 from zope.interface import implements
 
 from mailman import Utils
-from mailman import Version
+from mailman.app.archiving import get_primary_archiver
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.interfaces import IHandler, Personalization, ReplyToMunging
-from mailman.app.archiving import get_primary_archiver
+from mailman.version import VERSION
 
 
 CONTINUATION = ',\n\t'
@@ -98,7 +98,7 @@ def process(mlist, msg, msgdata):
     # using such an old version, they may be vulnerable.  It's too easy to
     # edit the code to add a configuration variable to handle this.
     if 'x-mailman-version' not in msg:
-        msg['X-Mailman-Version'] = Version.VERSION
+        msg['X-Mailman-Version'] = VERSION
     # We set "Precedence: list" because this is the recommendation from the
     # sendmail docs, the most authoritative source of this header's semantics.
     if 'precedence' not in msg:
diff --git a/mailman/pipeline/mime_delete.py b/mailman/pipeline/mime_delete.py
index 68c860da2..97f892f18 100644
--- a/mailman/pipeline/mime_delete.py
+++ b/mailman/pipeline/mime_delete.py
@@ -40,7 +40,7 @@ from zope.interface import implements
 from mailman import Errors
 from mailman.Message import UserNotification
 from mailman.Utils import oneline
-from mailman.Version import VERSION
+from mailman.version import VERSION
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.interfaces import IHandler
diff --git a/mailman/Version.py b/mailman/version.py
index 6a0cfa642..6a0cfa642 100644
--- a/mailman/Version.py
+++ b/mailman/version.py