diff options
30 files changed, 15 insertions, 64 deletions
diff --git a/.bzrignore b/.bzrignore index 2763fcac6..f8601acd0 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,7 +1,7 @@ *.mo .bzrignore build/ -bzr-*-linux-i686.egg/ +bzr-*.egg/ cron/crontab.in dist/ mailman.egg-info diff --git a/mailman/Archiver/HyperArch.py b/mailman/Archiver/HyperArch.py index 48e6d5835..11fd32cf1 100644 --- a/mailman/Archiver/HyperArch.py +++ b/mailman/Archiver/HyperArch.py @@ -26,8 +26,6 @@ (probably in the 'update_dirty_archives' method). """ -from __future__ import with_statement - import os import re import sys diff --git a/mailman/MTA/Postfix.py b/mailman/MTA/Postfix.py index 8df04417e..7f4fa1050 100644 --- a/mailman/MTA/Postfix.py +++ b/mailman/MTA/Postfix.py @@ -17,8 +17,6 @@ """Creation/deletion hooks for the Postfix MTA.""" -from __future__ import with_statement - import os import grp import pwd diff --git a/mailman/app/membership.py b/mailman/app/membership.py index 775c5cf59..ae14b3f25 100644 --- a/mailman/app/membership.py +++ b/mailman/app/membership.py @@ -17,8 +17,6 @@ """Application support for membership management.""" -from __future__ import with_statement - __metaclass__ = type __all__ = [ 'add_member', diff --git a/mailman/app/moderator.py b/mailman/app/moderator.py index 7ef454c03..9cce5aa8a 100644 --- a/mailman/app/moderator.py +++ b/mailman/app/moderator.py @@ -17,8 +17,6 @@ """Application support for moderators.""" -from __future__ import with_statement - __all__ = [ 'handle_message', 'handle_subscription', diff --git a/mailman/app/notifications.py b/mailman/app/notifications.py index 20d4c450a..41180de7d 100644 --- a/mailman/app/notifications.py +++ b/mailman/app/notifications.py @@ -17,8 +17,6 @@ """Sending notifications.""" -from __future__ import with_statement - __metaclass__ = type __all__ = [ 'send_admin_subscription_notice', diff --git a/mailman/app/registrar.py b/mailman/app/registrar.py index 77ec35fe3..320086ec7 100644 --- a/mailman/app/registrar.py +++ b/mailman/app/registrar.py @@ -25,8 +25,8 @@ __all__ = [ import datetime -import pkg_resources +from pkg_resources import resource_string from zope.interface import implements from mailman.Message import UserNotification @@ -75,8 +75,7 @@ class Registrar: # VERP_CONFIRMATIONS as well. subject = 'confirm ' + token # Send a verification email to the address. - text = _(pkg_resources.resource_string( - 'mailman.templates.en', 'verify.txt')) + text = _(resource_string('mailman.templates.en', 'verify.txt')) msg = UserNotification(address, confirm_address, subject, text) msg.send(mlist=None) return token diff --git a/mailman/app/replybot.py b/mailman/app/replybot.py index c8b1bb873..483f3f3cf 100644 --- a/mailman/app/replybot.py +++ b/mailman/app/replybot.py @@ -21,8 +21,6 @@ # mailing list. The reply governor should really apply site-wide per # recipient (I think). -from __future__ import with_statement - __all__ = [ 'autorespond_to_sender', 'can_acknowledge', diff --git a/mailman/bin/add_members.py b/mailman/bin/add_members.py index 613d2b322..0ee0e8e84 100644 --- a/mailman/bin/add_members.py +++ b/mailman/bin/add_members.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement - import os import sys import codecs diff --git a/mailman/bin/arch.py b/mailman/bin/arch.py index a153ef9fa..7406dc32a 100644 --- a/mailman/bin/arch.py +++ b/mailman/bin/arch.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement - import os import sys import errno diff --git a/mailman/bin/create_list.py b/mailman/bin/create_list.py index c25ab3283..83c3c7c5d 100644 --- a/mailman/bin/create_list.py +++ b/mailman/bin/create_list.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement - import sys from mailman import errors diff --git a/mailman/bin/dumpdb.py b/mailman/bin/dumpdb.py index b88c34174..cb7ca7fd7 100644 --- a/mailman/bin/dumpdb.py +++ b/mailman/bin/dumpdb.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement - import pprint import cPickle diff --git a/mailman/bin/gate_news.py b/mailman/bin/gate_news.py index b58bbd178..25de5677d 100644 --- a/mailman/bin/gate_news.py +++ b/mailman/bin/gate_news.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement - import os import sys import time diff --git a/mailman/bin/inject.py b/mailman/bin/inject.py index 4f4f73b0e..d4fb6fb6f 100644 --- a/mailman/bin/inject.py +++ b/mailman/bin/inject.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement - import os import sys diff --git a/mailman/bin/mailmanctl.py b/mailman/bin/mailmanctl.py index 588112249..5492892c5 100644 --- a/mailman/bin/mailmanctl.py +++ b/mailman/bin/mailmanctl.py @@ -17,8 +17,6 @@ """Mailman start/stop script.""" -from __future__ import with_statement - import os import grp import pwd diff --git a/mailman/bin/make_instance.py b/mailman/bin/make_instance.py index b885b7e5c..b63576fb1 100644 --- a/mailman/bin/make_instance.py +++ b/mailman/bin/make_instance.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement - import os import grp import pwd diff --git a/mailman/bin/master.py b/mailman/bin/master.py index e71e21162..1c45e04f8 100644 --- a/mailman/bin/master.py +++ b/mailman/bin/master.py @@ -17,8 +17,6 @@ """Master sub-process watcher.""" -from __future__ import with_statement - __metaclass__ = type __all__ = [ 'Loop', diff --git a/mailman/bin/set_members.py b/mailman/bin/set_members.py index 42e91c097..70c90b13b 100644 --- a/mailman/bin/set_members.py +++ b/mailman/bin/set_members.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement - import csv import optparse diff --git a/mailman/bin/testall.py b/mailman/bin/testall.py index 9efbb1cde..83029060c 100644 --- a/mailman/bin/testall.py +++ b/mailman/bin/testall.py @@ -17,8 +17,6 @@ """Mailman unit test driver.""" -from __future__ import with_statement - import os import re import grp diff --git a/mailman/chains/hold.py b/mailman/chains/hold.py index a500b22fc..85e8c3fec 100644 --- a/mailman/chains/hold.py +++ b/mailman/chains/hold.py @@ -17,10 +17,10 @@ """The terminal 'hold' chain.""" -from __future__ import with_statement - -__all__ = ['HoldChain'] __metaclass__ = type +__all__ = [ + 'HoldChain', + ] import logging diff --git a/mailman/database/__init__.py b/mailman/database/__init__.py index 6cce695c0..dfafe4473 100644 --- a/mailman/database/__init__.py +++ b/mailman/database/__init__.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement - __metaclass__ = type __all__ = [ 'StockDatabase', diff --git a/mailman/database/messagestore.py b/mailman/database/messagestore.py index 43cad917f..a784f89cc 100644 --- a/mailman/database/messagestore.py +++ b/mailman/database/messagestore.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement - __metaclass__ = type __all__ = [ 'MessageStore', diff --git a/mailman/database/usermanager.py b/mailman/database/usermanager.py index 5af160486..fb97f0947 100644 --- a/mailman/database/usermanager.py +++ b/mailman/database/usermanager.py @@ -17,8 +17,6 @@ """A user manager.""" -from __future__ import with_statement - import os from zope.interface import implements diff --git a/mailman/pipeline/file_recipients.py b/mailman/pipeline/file_recipients.py index 5f47059d3..fd7ff0b69 100644 --- a/mailman/pipeline/file_recipients.py +++ b/mailman/pipeline/file_recipients.py @@ -17,10 +17,10 @@ """Get the normal delivery recipients from a Sendmail style :include: file.""" -from __future__ import with_statement - __metaclass__ = type -__all__ = ['FileRecipients'] +__all__ = [ + 'FileRecipients', + ] import os diff --git a/mailman/pipeline/scrubber.py b/mailman/pipeline/scrubber.py index a513d0689..4b8d9f770 100644 --- a/mailman/pipeline/scrubber.py +++ b/mailman/pipeline/scrubber.py @@ -17,10 +17,10 @@ """Cleanse a message for archiving.""" -from __future__ import with_statement - __metaclass__ = type -__all__ = ['Scrubber'] +__all__ = [ + 'Scrubber', + ] import os diff --git a/mailman/pipeline/to_digest.py b/mailman/pipeline/to_digest.py index 7c868fe74..cec2fa1fc 100644 --- a/mailman/pipeline/to_digest.py +++ b/mailman/pipeline/to_digest.py @@ -25,10 +25,10 @@ # directory and the DigestRunner will craft the MIME, rfc1153, and # (eventually) URL-subject linked digests from the mbox. -from __future__ import with_statement - __metaclass__ = type -__all__ = ['ToDigest'] +__all__ = [ + 'ToDigest', + ] import os diff --git a/mailman/queue/__init__.py b/mailman/queue/__init__.py index 58e8b84d2..961a46283 100644 --- a/mailman/queue/__init__.py +++ b/mailman/queue/__init__.py @@ -24,8 +24,6 @@ written. First, the message is written to the pickle, then the metadata dictionary is written. """ -from __future__ import with_statement - __metaclass__ = type __all__ = [ 'Runner', diff --git a/mailman/queue/archive.py b/mailman/queue/archive.py index a10ae3e9c..6dda70387 100644 --- a/mailman/queue/archive.py +++ b/mailman/queue/archive.py @@ -17,8 +17,6 @@ """Archive queue runner.""" -from __future__ import with_statement - __metaclass__ = type __all__ = [ 'ArchiveRunner', diff --git a/mailman/testing/helpers.py b/mailman/testing/helpers.py index 5bd019ab7..47c20ca2f 100644 --- a/mailman/testing/helpers.py +++ b/mailman/testing/helpers.py @@ -17,8 +17,6 @@ """Various test helpers.""" -from __future__ import with_statement - __metaclass__ = type __all__ = [ 'TestableMaster', diff --git a/mailman/tests/test_bounces.py b/mailman/tests/test_bounces.py index 9852bebe6..473691dfd 100644 --- a/mailman/tests/test_bounces.py +++ b/mailman/tests/test_bounces.py @@ -17,8 +17,6 @@ """Test the bounce detection modules.""" -from __future__ import with_statement - import os import sys import email |