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

Will backport to 2.3.

diff --git a/Doc/lib/liblocale.tex b/Doc/lib/liblocale.tex
index df1f6fd2cbc5671d613059973088c1c52b48dd1f..967c75991ea2cecefea04c4790cecc8bef17b4b8 100644 (file)
--- a/Doc/lib/liblocale.tex
+++ b/Doc/lib/liblocale.tex
@@ -398,7 +398,7 @@ Example:
 \begin{verbatim}
 >>> import 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.setlocale(locale.LC_ALL, '') # use user's preferred locale
 >>> locale.setlocale(locale.LC_ALL, 'C') # use default (C) locale

diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index 263e88179ef792b515655398d93b9c2f7145d69c..980302d4efd7aba0c175345537266d26e8c11d46 100644 (file)
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -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
 documentation for any purpose and without fee is hereby granted,
@@ -177,7 +177,7 @@ PyLocale_setlocale(PyObject* self, PyObject* args)
         result = setlocale(category, locale);
         if (!result) {
             /* operation failed, no setting was changed */
-            PyErr_SetString(Error, "locale setting not supported");
+            PyErr_SetString(Error, "unsupported locale setting");
             return NULL;
         }
         result_object = PyString_FromString(result);