summaryrefslogtreecommitdiffstats
path: root/Lib/locale.py
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2011-11-05 08:18:50 (GMT)
committerPetri Lehtinen <petri@digip.org>2011-11-05 08:21:16 (GMT)
commit395ca7238015eb5aacadde2917c185cba5fea726 (patch)
tree5f6a1fe3e86554d18644fe479e20cd14ad6e7c8d /Lib/locale.py
parent8c482ee95564f04df01fc856f313ff8c98846718 (diff)
downloadcpython-395ca7238015eb5aacadde2917c185cba5fea726.zip
cpython-395ca7238015eb5aacadde2917c185cba5fea726.tar.gz
cpython-395ca7238015eb5aacadde2917c185cba5fea726.tar.bz2
Issue #3067: Enhance the documentation and docstring of locale.setlocale()
Diffstat (limited to 'Lib/locale.py')
-rw-r--r--Lib/locale.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/locale.py b/Lib/locale.py
index 58cf0a7..d9dbce6 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -526,9 +526,10 @@ def getlocale(category=LC_CTYPE):
def setlocale(category, locale=None):
""" Set the locale for the given category. The locale can be
- a string, a locale tuple (language code, encoding), or None.
+ a string, an iterable of two strings (language code and encoding),
+ or None.
- Locale tuples are converted to strings the locale aliasing
+ Iterables are converted to strings using the locale aliasing
engine. Locale strings are passed directly to the C lib.
category may be given as one of the LC_* values.