Now that Python 2.3 is the minimum requirement for Mailman 2.2:

- Remove True/False binding cruft
- Remove __future__ statements for nested scopes
- Remove ascii_letters import hack from Utils.py
- Remove mimetypes.guess_all_extensions import hack from Scrubber.py
- In Pending.py, set _missing to object() (better than using [])

Also, update copyright years where appropriate, and re-order imports more to
my PEP 8 tastes.  Whitespace normalize.

1 files changed, 5 insertions, 12 deletions

diff --git a/Mailman/Queue/NewsRunner.py b/Mailman/Queue/NewsRunner.py
index 448500633..fa0e91377 100644
--- a/Mailman/Queue/NewsRunner.py
+++ b/Mailman/Queue/NewsRunner.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2000-2005 by the Free Software Foundation, Inc.
+# Copyright (C) 2000-2006 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,19 +17,19 @@
 """NNTP queue runner."""
 
 import re
+import email
 import socket
 import nntplib
-from cStringIO import StringIO
 
-import email
+from cStringIO import StringIO
 from email.Utils import getaddresses
 
 COMMASPACE = ', '
 
-from Mailman import mm_cfg
 from Mailman import Utils
-from Mailman.Queue.Runner import Runner
+from Mailman import mm_cfg
 from Mailman.Logging.Syslog import syslog
+from Mailman.Queue.Runner import Runner
 
 
 # Matches our Mailman crafted Message-IDs.  See Utils.unique_message_id()
@@ -45,13 +45,6 @@ mcre = re.compile(r"""
     """, re.VERBOSE)
 
 
-try:
-    True, False
-except NameError:
-    True = 1
-    False = 0
-
-
 
 class NewsRunner(Runner):
     QDIR = mm_cfg.NEWSQUEUE_DIR