-- removed get_default compatibility kludge
-- added a few extra comments to locale.py
diff --git a/Lib/locale.py b/Lib/locale.py
index 1014dbd..7dde040 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -290,9 +290,12 @@
except (ImportError, AttributeError):
pass
else:
+ # make sure the code/encoding values are valid
if sys.platform == "win32" and code and code[:2] == "0x":
# map windows language identifier to language name
code = windows_locale.get(int(code, 0))
+ # ...add other platform-specific processing here, if
+ # necessary...
return code, encoding
# fall back on POSIX behaviour
@@ -306,8 +309,6 @@
localename = 'C'
return _parse_localename(localename)
-# compatibility
-get_default = getdefaultlocale
def getlocale(category=LC_CTYPE):
diff --git a/Lib/site.py b/Lib/site.py
index 70284e1..17f253a 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -126,7 +126,7 @@
#
def locale_aware_defaultencoding():
import locale
- code, encoding = locale.get_default()
+ code, encoding = locale.getdefaultlocale()
if encoding is None:
encoding = 'ascii'
try: