ALLOW_RFC2369_OVERRIDES: I give up. Set this default to 1 to allow

list owners to override RFC 2369 headers.

Also, now that we're using the JapaneseCodecs 1.4.5 package, I don't
think we need to do the registration ourselves.

1 files changed, 6 insertions, 20 deletions

diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index a3e06e4d6..04f9051b8 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -826,11 +826,12 @@ DEFAULT_OBSCURE_ADDRESSES = 1
 # through to the mailing list membership.  These are a very useful aid to end
 # users and should always be added.  However, not all MUAs are compliant and
 # if a list's membership has many such users, they may clamor for these
-# headers to be suppressed.  Because standards compliance is of high
-# importance, by default list owners cannot suppress these headers.  By
-# setting this variable to 1, list owners will be given the option to suppress
-# these headers.
-ALLOW_RFC2369_OVERRIDES = 0
+# headers to be suppressed.  By setting this variable to 1, list owners will
+# be given the option to suppress these headers.  By setting it to 0, list
+# owners will not be given the option to suppress these headers (although some
+# header suppression may still take place, i.e. for announce-only lists, or
+# lists with no archives).
+ALLOW_RFC2369_OVERRIDES = 1
 
 # Defaults for content filtering on mailing lists.  DEFAULT_FILTER_CONTENT is
 # a flag which if set to true, turns on content filtering.
@@ -1142,18 +1143,3 @@ add_language('no',   _('Norwegian'),           'iso-8859-1')
 add_language('ru',   _('Russian'),             'koi8-r')
 
 del _                                   
-
-
-# Because the Japanese codecs are currently provided by a 3rd party package,
-# Pythons previous to 2.3 don't know about Japanese codec aliases.  Martin von
-# Loewis says these need to be added before any of the codecs are accessed.
-import encodings.aliases
-
-ja_aliases = {'euc_jp':'japanese.euc_jp',
-              'shift_jis':'japanese.shift_jis',
-              'windows-932':'japanese.ms932',
-              'cp932':'japanese.ms932',
-              'ms932':'japanese.ms932',
-              'iso_2022_jp':'japanese.iso_2022_jp',
-              }
-encodings.aliases.aliases.update(ja_aliases)