------------------------------------------------------------
revno: 6646
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: py26
timestamp: Fri 2008-10-17 13:58:18 -0400
message:
  The future is now.
modified:
  .bzrignore
  mailman/Archiver/HyperArch.py
  mailman/MTA/Postfix.py
  mailman/app/membership.py
  mailman/app/moderator.py
  mailman/app/notifications.py
  mailman/app/registrar.py
  mailman/app/replybot.py
  mailman/bin/add_members.py
  mailman/bin/arch.py
  mailman/bin/create_list.py
  mailman/bin/dumpdb.py
  mailman/bin/gate_news.py
  mailman/bin/inject.py
  mailman/bin/mailmanctl.py
  mailman/bin/make_instance.py
  mailman/bin/master.py
  mailman/bin/set_members.py
  mailman/bin/testall.py
  mailman/chains/hold.py
  mailman/database/__init__.py
  mailman/database/messagestore.py
  mailman/database/usermanager.py
  mailman/pipeline/file_recipients.py
  mailman/pipeline/scrubber.py
  mailman/pipeline/to_digest.py
  mailman/queue/__init__.py
  mailman/queue/archive.py
  mailman/testing/helpers.py
  mailman/tests/test_bounces.py

=== modified file '.bzrignore'
--- a/.bzrignore        2008-10-16 04:48:15 +0000
+++ b/.bzrignore        2008-10-17 17:58:18 +0000
@@ -1,7 +1,7 @@
 *.mo
 .bzrignore
 build/
-bzr-*-linux-i686.egg/
+bzr-*.egg/
 cron/crontab.in
 dist/
 mailman.egg-info

=== modified file 'mailman/Archiver/HyperArch.py'
--- a/mailman/Archiver/HyperArch.py     2008-09-28 19:55:09 +0000
+++ b/mailman/Archiver/HyperArch.py     2008-10-17 17:58:18 +0000
@@ -26,8 +26,6 @@
        (probably in the 'update_dirty_archives' method).
 """
 
-from __future__ import with_statement
-
 import os
 import re
 import sys

=== modified file 'mailman/MTA/Postfix.py'
--- a/mailman/MTA/Postfix.py    2008-09-25 03:46:44 +0000
+++ b/mailman/MTA/Postfix.py    2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """Creation/deletion hooks for the Postfix MTA."""
 
-from __future__ import with_statement
-
 import os
 import grp
 import pwd

=== modified file 'mailman/app/membership.py'
--- a/mailman/app/membership.py 2008-09-27 01:11:51 +0000
+++ b/mailman/app/membership.py 2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """Application support for membership management."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'add_member',

=== modified file 'mailman/app/moderator.py'
--- a/mailman/app/moderator.py  2008-09-27 01:11:51 +0000
+++ b/mailman/app/moderator.py  2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """Application support for moderators."""
 
-from __future__ import with_statement
-
 __all__ = [
     'handle_message',
     'handle_subscription',

=== modified file 'mailman/app/notifications.py'
--- a/mailman/app/notifications.py      2008-09-25 03:46:44 +0000
+++ b/mailman/app/notifications.py      2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """Sending notifications."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'send_admin_subscription_notice',

=== modified file 'mailman/app/registrar.py'
--- a/mailman/app/registrar.py  2008-09-25 03:46:44 +0000
+++ b/mailman/app/registrar.py  2008-10-17 17:58:18 +0000
@@ -25,8 +25,8 @@
 
 
 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 @@
         # 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

=== modified file 'mailman/app/replybot.py'
--- a/mailman/app/replybot.py   2008-09-25 03:46:44 +0000
+++ b/mailman/app/replybot.py   2008-10-17 17:58:18 +0000
@@ -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',

=== modified file 'mailman/bin/add_members.py'
--- a/mailman/bin/add_members.py        2008-09-27 01:11:51 +0000
+++ b/mailman/bin/add_members.py        2008-10-17 17:58:18 +0000
@@ -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

=== modified file 'mailman/bin/arch.py'
--- a/mailman/bin/arch.py       2008-09-25 03:46:44 +0000
+++ b/mailman/bin/arch.py       2008-10-17 17:58:18 +0000
@@ -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

=== modified file 'mailman/bin/create_list.py'
--- a/mailman/bin/create_list.py        2008-09-27 01:11:51 +0000
+++ b/mailman/bin/create_list.py        2008-10-17 17:58:18 +0000
@@ -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

=== modified file 'mailman/bin/dumpdb.py'
--- a/mailman/bin/dumpdb.py     2008-09-25 03:46:44 +0000
+++ b/mailman/bin/dumpdb.py     2008-10-17 17:58:18 +0000
@@ -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
 

=== modified file 'mailman/bin/gate_news.py'
--- a/mailman/bin/gate_news.py  2008-09-25 03:46:44 +0000
+++ b/mailman/bin/gate_news.py  2008-10-17 17:58:18 +0000
@@ -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

=== modified file 'mailman/bin/inject.py'
--- a/mailman/bin/inject.py     2008-09-25 03:46:44 +0000
+++ b/mailman/bin/inject.py     2008-10-17 17:58:18 +0000
@@ -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
 

=== modified file 'mailman/bin/mailmanctl.py'
--- a/mailman/bin/mailmanctl.py 2008-09-25 03:46:44 +0000
+++ b/mailman/bin/mailmanctl.py 2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """Mailman start/stop script."""
 
-from __future__ import with_statement
-
 import os
 import grp
 import pwd

=== modified file 'mailman/bin/make_instance.py'
--- a/mailman/bin/make_instance.py      2008-09-25 03:46:44 +0000
+++ b/mailman/bin/make_instance.py      2008-10-17 17:58:18 +0000
@@ -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

=== modified file 'mailman/bin/master.py'
--- a/mailman/bin/master.py     2008-09-25 03:46:44 +0000
+++ b/mailman/bin/master.py     2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """Master sub-process watcher."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'Loop',

=== modified file 'mailman/bin/set_members.py'
--- a/mailman/bin/set_members.py        2008-09-25 03:46:44 +0000
+++ b/mailman/bin/set_members.py        2008-10-17 17:58:18 +0000
@@ -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
 

=== modified file 'mailman/bin/testall.py'
--- a/mailman/bin/testall.py    2008-09-25 03:46:44 +0000
+++ b/mailman/bin/testall.py    2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """Mailman unit test driver."""
 
-from __future__ import with_statement
-
 import os
 import re
 import grp

=== modified file 'mailman/chains/hold.py'
--- a/mailman/chains/hold.py    2008-09-25 03:46:44 +0000
+++ b/mailman/chains/hold.py    2008-10-17 17:58:18 +0000
@@ -17,10 +17,10 @@
 
 """The terminal 'hold' chain."""
 
-from __future__ import with_statement
-
-__all__ = ['HoldChain']
 __metaclass__ = type
+__all__ = [
+    'HoldChain',
+    ]
 
 
 import logging

=== modified file 'mailman/database/__init__.py'
--- a/mailman/database/__init__.py      2008-09-25 03:46:44 +0000
+++ b/mailman/database/__init__.py      2008-10-17 17:58:18 +0000
@@ -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',

=== modified file 'mailman/database/messagestore.py'
--- a/mailman/database/messagestore.py  2008-09-25 03:46:44 +0000
+++ b/mailman/database/messagestore.py  2008-10-17 17:58:18 +0000
@@ -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',

=== modified file 'mailman/database/usermanager.py'
--- a/mailman/database/usermanager.py   2008-09-25 03:46:44 +0000
+++ b/mailman/database/usermanager.py   2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """A user manager."""
 
-from __future__ import with_statement
-
 import os
 
 from zope.interface import implements

=== modified file 'mailman/pipeline/file_recipients.py'
--- a/mailman/pipeline/file_recipients.py       2008-09-27 01:11:51 +0000
+++ b/mailman/pipeline/file_recipients.py       2008-10-17 17:58:18 +0000
@@ -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

=== modified file 'mailman/pipeline/scrubber.py'
--- a/mailman/pipeline/scrubber.py      2008-10-16 04:48:15 +0000
+++ b/mailman/pipeline/scrubber.py      2008-10-17 17:58:18 +0000
@@ -17,10 +17,10 @@
 
 """Cleanse a message for archiving."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
-__all__ = ['Scrubber']
+__all__ = [
+    'Scrubber',
+    ]
 
 
 import os

=== modified file 'mailman/pipeline/to_digest.py'
--- a/mailman/pipeline/to_digest.py     2008-09-27 01:11:51 +0000
+++ b/mailman/pipeline/to_digest.py     2008-10-17 17:58:18 +0000
@@ -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

=== modified file 'mailman/queue/__init__.py'
--- a/mailman/queue/__init__.py 2008-10-16 04:48:15 +0000
+++ b/mailman/queue/__init__.py 2008-10-17 17:58:18 +0000
@@ -24,8 +24,6 @@
 dictionary is written.
 """
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'Runner',

=== modified file 'mailman/queue/archive.py'
--- a/mailman/queue/archive.py  2008-09-29 13:19:52 +0000
+++ b/mailman/queue/archive.py  2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """Archive queue runner."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'ArchiveRunner',

=== modified file 'mailman/testing/helpers.py'
--- a/mailman/testing/helpers.py        2008-09-30 01:48:19 +0000
+++ b/mailman/testing/helpers.py        2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """Various test helpers."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'TestableMaster',

=== modified file 'mailman/tests/test_bounces.py'
--- a/mailman/tests/test_bounces.py     2008-09-25 03:46:44 +0000
+++ b/mailman/tests/test_bounces.py     2008-10-17 17:58:18 +0000
@@ -17,8 +17,6 @@
 
 """Test the bounce detection modules."""
 
-from __future__ import with_statement
-
 import os
 import sys
 import email



--
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

Reply via email to