From 25f90d5c5dc70931f750258d5e70e6a916cdf23a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Wed, 3 Sep 2003 04:50:13 +0000 Subject: Use de_DE in example, change message for unknown locale. Fixes #797447. Will backport to 2.3. --- Doc/lib/liblocale.tex | 2 +- Modules/_localemodule.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/lib/liblocale.tex b/Doc/lib/liblocale.tex index df1f6fd..967c759 100644 --- 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 263e881..980302d 100644 --- 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); -- cgit v0.12