------------------------------------------------------------
revno: 6625
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: version-fix
timestamp: Mon 2008-03-31 14:12:04 -0400
message:
mailman.Version -> mailman.version
renamed:
mailman/Version.py => mailman/version.py
modified:
mailman/Cgi/wsgi_app.py
mailman/bin/add_members.py
mailman/bin/arch.py
mailman/bin/bumpdigests.py
mailman/bin/change_pw.py
mailman/bin/check_perms.py
mailman/bin/checkdbs.py
mailman/bin/cleanarch.py
mailman/bin/config_list.py
mailman/bin/disabled.py
mailman/bin/export.py
mailman/bin/find_member.py
mailman/bin/gate_news.py
mailman/bin/genaliases.py
mailman/bin/import.py
mailman/bin/inject.py
mailman/bin/list_lists.py
mailman/bin/list_members.py
mailman/bin/list_owners.py
mailman/bin/mailmanctl.py
mailman/bin/make_instance.py
mailman/bin/mmsitepass.py
mailman/bin/nightly_gzip.py
mailman/bin/senddigests.py
mailman/bin/set_members.py
mailman/bin/show_config.py
mailman/bin/show_qfiles.py
mailman/bin/testall.py
mailman/bin/unshunt.py
mailman/bin/update.py
mailman/bin/version.py
mailman/bin/withlist.py
mailman/configuration.py
mailman/database/__init__.py
mailman/htmlformat.py
mailman/interfaces/database.py
mailman/options.py
mailman/pipeline/cook_headers.py
mailman/pipeline/mime_delete.py
=== modified file 'mailman/Cgi/wsgi_app.py'
--- a/mailman/Cgi/wsgi_app.py 2008-02-08 04:01:48 +0000
+++ b/mailman/Cgi/wsgi_app.py 2008-03-31 18:12:04 +0000
@@ -166,7 +166,7 @@
except ImportError:
traceback = None
try:
- from Mailman.Version import VERSION
+ from mailman.version import VERSION
except ImportError:
VERSION = '<undetermined>'
=== modified file 'mailman/bin/add_members.py'
--- a/mailman/bin/add_members.py 2008-03-23 21:38:41 +0000
+++ b/mailman/bin/add_members.py 2008-03-31 18:12:04 +0000
@@ -27,7 +27,6 @@
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
=== modified file 'mailman/bin/arch.py'
--- a/mailman/bin/arch.py 2008-03-27 09:14:14 +0000
+++ b/mailman/bin/arch.py 2008-03-31 18:12:04 +0000
@@ -25,19 +25,19 @@
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]
=== modified file 'mailman/bin/bumpdigests.py'
--- a/mailman/bin/bumpdigests.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/bumpdigests.py 2008-03-31 18:12:04 +0000
@@ -20,9 +20,9 @@
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 @@
def parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options] [listname ...]
=== modified file 'mailman/bin/change_pw.py'
--- a/mailman/bin/change_pw.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/change_pw.py 2008-03-31 18:12:04 +0000
@@ -25,9 +25,9 @@
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 @@
def parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%%prog [options]
=== modified file 'mailman/bin/check_perms.py'
--- a/mailman/bin/check_perms.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/check_perms.py 2008-03-31 18:12:04 +0000
@@ -24,9 +24,9 @@
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 parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options]
=== modified file 'mailman/bin/checkdbs.py'
--- a/mailman/bin/checkdbs.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/checkdbs.py 2008-03-31 18:12:04 +0000
@@ -24,10 +24,10 @@
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 @@
def parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options]
=== modified file 'mailman/bin/cleanarch.py'
--- a/mailman/bin/cleanarch.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/cleanarch.py 2008-03-31 18:12:04 +0000
@@ -22,8 +22,8 @@
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 @@
def parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options] < inputfile > outputfile
=== modified file 'mailman/bin/config_list.py'
--- a/mailman/bin/config_list.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/config_list.py 2008-03-31 18:12:04 +0000
@@ -23,9 +23,9 @@
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 @@
def parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options] listname
=== modified file 'mailman/bin/disabled.py'
--- a/mailman/bin/disabled.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/disabled.py 2008-03-31 18:12:04 +0000
@@ -23,11 +23,11 @@
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 parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options]
=== modified file 'mailman/bin/export.py'
--- a/mailman/bin/export.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/export.py 2008-03-31 18:12:04 +0000
@@ -31,13 +31,14 @@
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
-
-SPACE = ' '
+from mailman.version import MAILMAN_VERSION
+
+
+SPACE = ' '
TYPES = {
Defaults.Toggle : 'bool',
=== modified file 'mailman/bin/find_member.py'
--- a/mailman/bin/find_member.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/find_member.py 2008-03-31 18:12:04 +0000
@@ -21,9 +21,9 @@
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 @@
def parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options] regex [regex ...]
=== modified file 'mailman/bin/gate_news.py'
--- a/mailman/bin/gate_news.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/gate_news.py 2008-03-31 18:12:04 +0000
@@ -32,11 +32,11 @@
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 @@
def parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options]
=== modified file 'mailman/bin/genaliases.py'
--- a/mailman/bin/genaliases.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/genaliases.py 2008-03-31 18:12:04 +0000
@@ -21,15 +21,15 @@
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]
=== modified file 'mailman/bin/import.py'
--- a/mailman/bin/import.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/import.py 2008-03-31 18:12:04 +0000
@@ -29,11 +29,11 @@
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 parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options]
=== modified file 'mailman/bin/inject.py'
--- a/mailman/bin/inject.py 2008-03-30 23:38:18 +0000
+++ b/mailman/bin/inject.py 2008-03-31 18:12:04 +0000
@@ -23,7 +23,6 @@
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 _
=== modified file 'mailman/bin/list_lists.py'
--- a/mailman/bin/list_lists.py 2008-03-26 02:28:57 +0000
+++ b/mailman/bin/list_lists.py 2008-03-31 18:12:04 +0000
@@ -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
=== modified file 'mailman/bin/list_members.py'
--- a/mailman/bin/list_members.py 2008-03-23 21:38:41 +0000
+++ b/mailman/bin/list_members.py 2008-03-31 18:12:04 +0000
@@ -21,7 +21,6 @@
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
=== modified file 'mailman/bin/list_owners.py'
--- a/mailman/bin/list_owners.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/list_owners.py 2008-03-31 18:12:04 +0000
@@ -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 ...]
=== modified file 'mailman/bin/mailmanctl.py'
--- a/mailman/bin/mailmanctl.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/mailmanctl.py 2008-03-31 18:12:04 +0000
@@ -29,10 +29,10 @@
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 @@
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.
=== modified file 'mailman/bin/make_instance.py'
--- a/mailman/bin/make_instance.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/make_instance.py 2008-03-31 18:12:04 +0000
@@ -30,7 +30,7 @@
from string import Template
from mailman import Defaults
-from mailman.Version import MAILMAN_VERSION
+from mailman.version import MAILMAN_VERSION
from mailman.i18n import _
=== modified file 'mailman/bin/mmsitepass.py'
--- a/mailman/bin/mmsitepass.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/mmsitepass.py 2008-03-31 18:12:04 +0000
@@ -20,16 +20,16 @@
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]
=== modified file 'mailman/bin/nightly_gzip.py'
--- a/mailman/bin/nightly_gzip.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/nightly_gzip.py 2008-03-31 18:12:04 +0000
@@ -25,15 +25,15 @@
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 ...]
=== modified file 'mailman/bin/senddigests.py'
--- a/mailman/bin/senddigests.py 2008-03-27 09:14:14 +0000
+++ b/mailman/bin/senddigests.py 2008-03-31 18:12:04 +0000
@@ -20,9 +20,9 @@
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 @@
def parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options]
=== modified file 'mailman/bin/set_members.py'
--- a/mailman/bin/set_members.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/set_members.py 2008-03-31 18:12:04 +0000
@@ -22,13 +22,13 @@
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 @@
def parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options] csv-file
=== modified file 'mailman/bin/show_config.py'
--- a/mailman/bin/show_config.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/show_config.py 2008-03-31 18:12:04 +0000
@@ -20,11 +20,10 @@
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 @@
def parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%%prog [options] [pattern ...]
=== modified file 'mailman/bin/show_qfiles.py'
--- a/mailman/bin/show_qfiles.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/show_qfiles.py 2008-03-31 18:12:04 +0000
@@ -19,11 +19,9 @@
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
=== modified file 'mailman/bin/testall.py'
--- a/mailman/bin/testall.py 2008-03-13 01:52:43 +0000
+++ b/mailman/bin/testall.py 2008-03-31 18:12:04 +0000
@@ -31,10 +31,11 @@
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 parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options] [tests]
=== modified file 'mailman/bin/unshunt.py'
--- a/mailman/bin/unshunt.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/unshunt.py 2008-03-31 18:12:04 +0000
@@ -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]
=== modified file 'mailman/bin/update.py'
--- a/mailman/bin/update.py 2008-02-27 06:26:18 +0000
+++ b/mailman/bin/update.py 2008-03-31 18:12:04 +0000
@@ -32,7 +32,7 @@
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 @@
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 @@
#
# 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()
=== modified file 'mailman/bin/version.py'
--- a/mailman/bin/version.py 2008-03-31 03:00:08 +0000
+++ b/mailman/bin/version.py 2008-03-31 18:12:04 +0000
@@ -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 @@
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)')
=== modified file 'mailman/bin/withlist.py'
--- a/mailman/bin/withlist.py 2008-03-31 02:55:22 +0000
+++ b/mailman/bin/withlist.py 2008-03-31 18:12:04 +0000
@@ -20,11 +20,12 @@
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 parseargs():
- parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+ parser = optparse.OptionParser(version=MAILMAN_VERSION,
usage=_("""\
%prog [options] listname [args ...]
=== modified file 'mailman/configuration.py'
--- a/mailman/configuration.py 2008-03-12 22:35:16 +0000
+++ b/mailman/configuration.py 2008-03-31 18:12:04 +0000
@@ -23,7 +23,7 @@
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 @@
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
=== modified file 'mailman/database/__init__.py'
--- a/mailman/database/__init__.py 2008-03-13 01:22:48 +0000
+++ b/mailman/database/__init__.py 2008-03-31 18:12:04 +0000
@@ -30,7 +30,7 @@
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 @@
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
=== modified file 'mailman/htmlformat.py'
--- a/mailman/htmlformat.py 2008-02-08 04:01:48 +0000
+++ b/mailman/htmlformat.py 2008-03-31 18:12:04 +0000
@@ -23,7 +23,7 @@
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 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 @@
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'))
=== modified file 'mailman/interfaces/database.py'
--- a/mailman/interfaces/database.py 2008-03-13 00:34:03 +0000
+++ b/mailman/interfaces/database.py 2008-03-31 18:12:04 +0000
@@ -25,8 +25,8 @@
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
=== modified file 'mailman/options.py'
--- a/mailman/options.py 2008-03-23 21:38:41 +0000
+++ b/mailman/options.py 2008-03-31 18:12:04 +0000
@@ -29,7 +29,7 @@
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
=== modified file 'mailman/pipeline/cook_headers.py'
--- a/mailman/pipeline/cook_headers.py 2008-03-30 04:06:07 +0000
+++ b/mailman/pipeline/cook_headers.py 2008-03-31 18:12:04 +0000
@@ -30,11 +30,11 @@
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 @@
# 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:
=== modified file 'mailman/pipeline/mime_delete.py'
--- a/mailman/pipeline/mime_delete.py 2008-02-27 06:26:18 +0000
+++ b/mailman/pipeline/mime_delete.py 2008-03-31 18:12:04 +0000
@@ -40,7 +40,7 @@
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
=== renamed file 'mailman/Version.py' => 'mailman/version.py'
--
Primary development focus
https://code.launchpad.net/~mailman-coders/mailman/3.0
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
