[Python-checkins] cpython (merge 3.4 -> default): Merge from 3.4

andrew.kuchling python-checkins at python.org
Tue Apr 14 15:59:37 CEST 2015


https://hg.python.org/cpython/rev/5f04daa34a55
changeset:   95634:5f04daa34a55
parent:      95631:dd8f48ff9480
parent:      95633:717d87c13f0d
user:        Andrew Kuchling <amk at amk.ca>
date:        Tue Apr 14 09:59:09 2015 -0400
summary:
  Merge from 3.4

files:
  Lib/gettext.py |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/gettext.py b/Lib/gettext.py
--- a/Lib/gettext.py
+++ b/Lib/gettext.py
@@ -52,7 +52,9 @@
 
 __all__ = ['NullTranslations', 'GNUTranslations', 'Catalog',
            'find', 'translation', 'install', 'textdomain', 'bindtextdomain',
-           'dgettext', 'dngettext', 'gettext', 'ngettext',
+           'bind_textdomain_codeset',
+           'dgettext', 'dngettext', 'gettext', 'lgettext', 'ldgettext',
+           'ldngettext', 'lngettext', 'ngettext',
            ]
 
 _default_localedir = os.path.join(sys.base_prefix, 'share', 'locale')

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list