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:18:50 (GMT)
commit416ecffcc49941a39ec3109eb20ae9ce558326ea (patch)
tree8e596a0880c41d66ac21866064114f5139f2d8c1 /Lib/locale.py
parent49aa72ed4c48fb613893388b470aa5b5464c1952 (diff)
downloadcpython-416ecffcc49941a39ec3109eb20ae9ce558326ea.zip
cpython-416ecffcc49941a39ec3109eb20ae9ce558326ea.tar.gz
cpython-416ecffcc49941a39ec3109eb20ae9ce558326ea.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 ae667a8..561e9e4 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -524,9 +524,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.