Update of /cvsroot/mailman/mailman/Mailman
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14431/Mailman
Modified Files:
Tag: Release_2_1-maint
Defaults.py.in Deliverer.py MailList.py Message.py versions.py
Log Message:
A cleansing pass, almost entirely cosmetic. Such things as whitespace
normalization, removal of tabs, copyright year updates to changed files,
docstring and comment fixes, and usage of True/False. I also made a pass
through the NEWS file.
One import was reordered, and after this commit I will move the mmdsr.readme
file to README.mmdsr.
>From my perspective, after that we're ready to go.
I will port these changes forward to the trunk.
Index: Defaults.py.in
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Defaults.py.in,v
retrieving revision 2.112.2.34
retrieving revision 2.112.2.35
diff -u -d -r2.112.2.34 -r2.112.2.35
--- Defaults.py.in 24 Dec 2005 01:26:12 -0000 2.112.2.34
+++ Defaults.py.in 30 Dec 2005 18:50:07 -0000 2.112.2.35
@@ -14,10 +14,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
-"""Distributed default settings for significant Mailman config variables.
-"""
+"""Distributed default settings for significant Mailman config variables."""
# NEVER make site configuration changes to this file. ALWAYS make them in
# mm_cfg.py instead, in the designated area. See the comments in that file
@@ -265,7 +265,7 @@
# 'attachement-xxx' instead. The default is set True because the applications
# on PC and Mac begin to use longer non-ascii filenames. Historically, it
# was set False in 2.1.6 for backward compatiblity but it was reset to True
-# for safer operation in mailman-2.1.7.
+# for safer operation in mailman-2.1.7.
SCRUBBER_DONT_USE_ATTACHMENT_FILENAME = True
# Use of attachment filename extension per se is may be dangerous because
Index: Deliverer.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Deliverer.py,v
retrieving revision 2.22.2.7
retrieving revision 2.22.2.8
diff -u -d -r2.22.2.7 -r2.22.2.8
--- Deliverer.py 6 Dec 2005 22:50:34 -0000 2.22.2.7
+++ Deliverer.py 30 Dec 2005 18:50:07 -0000 2.22.2.8
@@ -220,7 +220,8 @@
subject = _('%(listname)s mailing list probe message')
finally:
i18n.set_translation(otrans)
- outer = Message.UserNotification(member, probeaddr, subject,
lang=ulang)
+ outer = Message.UserNotification(member, probeaddr, subject,
+ lang=ulang)
outer.set_type('multipart/mixed')
text = MIMEText(text, _charset=Utils.GetCharSet(ulang))
outer.attach(text)
Index: MailList.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/MailList.py,v
retrieving revision 2.100.2.29
retrieving revision 2.100.2.30
diff -u -d -r2.100.2.29 -r2.100.2.30
--- MailList.py 3 Dec 2005 01:07:41 -0000 2.100.2.29
+++ MailList.py 30 Dec 2005 18:50:07 -0000 2.100.2.30
@@ -12,7 +12,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
"""The class representing a Mailman mailing list.
@@ -1469,13 +1470,13 @@
"""Returns matched entry in ban_list if email matches.
Otherwise returns None.
"""
- ban = 0
+ ban = False
for pattern in self.ban_list:
if pattern.startswith('^'):
# This is a regular expression match
try:
if re.search(pattern, email, re.IGNORECASE):
- ban = 1
+ ban = True
break
except re.error:
# BAW: we should probably remove this pattern
@@ -1483,7 +1484,7 @@
else:
# Do the comparison case insensitively
if pattern.lower() == email.lower():
- ban = 1
+ ban = True
break
if ban:
return pattern
Index: Message.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Message.py,v
retrieving revision 2.25.2.8
retrieving revision 2.25.2.9
diff -u -d -r2.25.2.8 -r2.25.2.9
--- Message.py 6 Dec 2005 00:31:16 -0000 2.25.2.8
+++ Message.py 30 Dec 2005 18:50:07 -0000 2.25.2.9
@@ -12,7 +12,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
"""Standard Mailman message object.
@@ -190,7 +191,7 @@
def get_filename(self, failobj=None):
"""Some MUA have bugs in RFC2231 filename encoding and cause
- mailman to stop delivery in Scrubber.py (called from ToDigest.py).
+ Mailman to stop delivery in Scrubber.py (called from ToDigest.py).
"""
try:
filename = email.Message.Message.get_filename(self, failobj)
Index: versions.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/versions.py,v
retrieving revision 2.38.2.9
retrieving revision 2.38.2.10
diff -u -d -r2.38.2.9 -r2.38.2.10
--- versions.py 27 Aug 2005 01:40:15 -0000 2.38.2.9
+++ versions.py 30 Dec 2005 18:50:07 -0000 2.38.2.10
@@ -12,7 +12,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
"""Routines which rectify an old mailing list with current structure.
@@ -29,7 +30,6 @@
finds a version change it runs this routine and then updates the data_version
number of the list, and then does a .Save(), so the transformations won't be
run again until another version change is detected.
-
"""
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
