aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbwarsaw <>2005-07-17 23:53:35 +0000
committerbwarsaw <>2005-07-17 23:53:35 +0000
commit24e127129a6e2f350cabafe1cd65b41dad307cc8 (patch)
tree195e71c5d7e310d503335d6136a67a69bbed2d79
parent416398f3018086fccaa6035cb47a29e8782af4dc (diff)
downloadmailman2-24e127129a6e2f350cabafe1cd65b41dad307cc8.tar.gz
mailman2-24e127129a6e2f350cabafe1cd65b41dad307cc8.tar.xz
mailman2-24e127129a6e2f350cabafe1cd65b41dad307cc8.zip
Whitespace normalization, and updates of copyright years.
-rw-r--r--Mailman/Gui/ContentFilter.py14
-rw-r--r--Mailman/Handlers/MimeDel.py2
-rw-r--r--Mailman/Logging/Logger.py8
-rw-r--r--Mailman/versions.py9
4 files changed, 16 insertions, 17 deletions
diff --git a/Mailman/Gui/ContentFilter.py b/Mailman/Gui/ContentFilter.py
index 401ecf9f..0cd35a0b 100644
--- a/Mailman/Gui/ContentFilter.py
+++ b/Mailman/Gui/ContentFilter.py
@@ -1,17 +1,17 @@
-# Copyright (C) 2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2005 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
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"""GUI component managing the content filtering options.
@@ -78,7 +78,7 @@ class ContentFilter(GUIBase):
('filter_mime_types', mm_cfg.Text, (10, WIDTH), 0,
_("""Remove message attachments that have a matching content
type."""),
-
+
_("""Use this option to remove each message attachment that
matches one of these content types. Each line should contain a
string naming a MIME <tt>type/subtype</tt>,
@@ -171,9 +171,9 @@ class ContentFilter(GUIBase):
doc.addError(_('Bad MIME type ignored: %(spectype)s'))
else:
types.append(spectype.strip().lower())
- if property == 'filter_mime_types':
+ if property == 'filter_mime_types':
mlist.filter_mime_types = types
- elif property == 'pass_mime_types':
+ elif property == 'pass_mime_types':
mlist.pass_mime_types = types
elif property in ('filter_filename_extensions',
'pass_filename_extensions'):
diff --git a/Mailman/Handlers/MimeDel.py b/Mailman/Handlers/MimeDel.py
index 3afdce95..71625099 100644
--- a/Mailman/Handlers/MimeDel.py
+++ b/Mailman/Handlers/MimeDel.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2005 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
diff --git a/Mailman/Logging/Logger.py b/Mailman/Logging/Logger.py
index b583a351..f1d47648 100644
--- a/Mailman/Logging/Logger.py
+++ b/Mailman/Logging/Logger.py
@@ -1,17 +1,17 @@
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2005 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
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"""File-based logger, writes to named category files in mm_cfg.LOG_DIR."""
diff --git a/Mailman/versions.py b/Mailman/versions.py
index 084a548f..847f7cc7 100644
--- a/Mailman/versions.py
+++ b/Mailman/versions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2005 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
@@ -398,15 +398,14 @@ def NewVars(l):
add_only_if_missing('scrub_nondigest', 0)
# ContentFilter by file extensions
add_only_if_missing('filter_filename_extensions',
- mm_cfg.DEFAULT_FILTER_FILENAME_EXTENSIONS)
+ mm_cfg.DEFAULT_FILTER_FILENAME_EXTENSIONS)
add_only_if_missing('pass_filename_extensions', [])
# automatic discard
add_only_if_missing('max_days_to_hold', 0)
add_only_if_missing('nonmember_rejection_notice', '')
# multipart/alternative collapse
- add_only_if_missing('collapse_alternatives',
- mm_cfg.DEFAULT_COLLAPSE_ALTERNATIVES)
-
+ add_only_if_missing('collapse_alternatives',
+ mm_cfg.DEFAULT_COLLAPSE_ALTERNATIVES)