mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Use de_DE in example, change message for unknown locale. Fixes #797447.

Browse source 
Will backport to 2.3.
This commit is contained in:
Martin v. Löwis 2003-09-03 04:50:13 +00:00
parent 2e31ce2514
commit 25f90d5c5d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/lib/liblocale.tex
View file

@ -398,7 +398,7 @@ Example:
\begin{verbatim} \begin{verbatim}
>>> import locale >>> import locale
>>> loc = locale.setlocale(locale.LC_ALL) # get current locale >>> loc = locale.setlocale(locale.LC_ALL) # get current locale
>>> locale.setlocale(locale.LC_ALL, 'de') # use German locale >>> locale.setlocale(locale.LC_ALL, 'de_DE') # use German locale; name might vary with platform
>>> locale.strcoll('f\xe4n', 'foo') # compare a string containing an umlaut >>> locale.strcoll('f\xe4n', 'foo') # compare a string containing an umlaut
>>> locale.setlocale(locale.LC_ALL, '') # use user's preferred locale >>> locale.setlocale(locale.LC_ALL, '') # use user's preferred locale
>>> locale.setlocale(locale.LC_ALL, 'C') # use default (C) locale >>> locale.setlocale(locale.LC_ALL, 'C') # use default (C) locale

4
Modules/_localemodule.c
View file

@ -1,5 +1,5 @@
/*********************************************************** /***********************************************************
Copyright (C) 1997, 2002 Martin von Loewis Copyright (C) 1997, 2002, 2003 Martin von Loewis
Permission to use, copy, modify, and distribute this software and its Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted, documentation for any purpose and without fee is hereby granted,
@ -177,7 +177,7 @@ PyLocale_setlocale(PyObject* self, PyObject* args)
result = setlocale(category, locale); result = setlocale(category, locale);
if (!result) { if (!result) {
/* operation failed, no setting was changed */ /* operation failed, no setting was changed */
PyErr_SetString(Error, "locale setting not supported"); PyErr_SetString(Error, "unsupported locale setting");
return NULL; return NULL;
} }
result_object = PyString_FromString(result); result_object = PyString_FromString(result);