------------------------------------------------------------
revno: 1687
fixes bug: https://launchpad.net/bugs/1647450
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Mon 2016-12-05 11:38:33 -0800
message:
  Fixed a NameError issue in bin/add_members with DISABLE_COMMAND_LOCALE_CSET = 
yes.
modified:
  Mailman/i18n.py
  NEWS


--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1

Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/i18n.py'
--- Mailman/i18n.py	2016-03-02 09:57:16 +0000
+++ Mailman/i18n.py	2016-12-05 19:38:33 +0000
@@ -35,6 +35,8 @@
 
 if not mm_cfg.DISABLE_COMMAND_LOCALE_CSET:
     _ctype_charset = _get_ctype_charset()
+else:
+    _ctype_charset = None
 
 
 
@@ -108,7 +110,7 @@
 
 def tolocale(s):
     global _ctype_charset
-    if isinstance(s, UnicodeType):
+    if isinstance(s, UnicodeType) or _ctype_charset is None:
         return s
     source = _translation.charset ()
     if not source:

=== modified file 'NEWS'
--- NEWS	2016-11-29 23:40:04 +0000
+++ NEWS	2016-12-05 19:38:33 +0000
@@ -23,6 +23,9 @@
 
   Bug fixes and other patches
 
+    - Fixed a NameError issue in bin/add_members with
+      DISABLE_COMMAND_LOCALE_CSET = yes.  (LP: #1647450)
+
     - The CleanseDKIM handler has been removed from OWNER_PIPELINE.  It isn't
       needed there and has adverse DMARC implications for messages to -owner
       of an anonymous list.  (LP: #1645901)

_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to