-- removed get_default compatibility kludge

Fredrik Lundh · Fredrik Lundh · commit 663809ed830a · 2000-07-10T19:32:19.000Z
-- added a few extra comments to locale.py
diff --git a/Lib/locale.py b/Lib/locale.py
@@ -290,9 +290,12 @@ def getdefaultlocale(envvars=('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG')):
     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 @@ def getdefaultlocale(envvars=('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG')):
         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
@@ -126,7 +126,7 @@ def addpackage(sitedir, name):
 #
 def locale_aware_defaultencoding():
     import locale
-    code, encoding = locale.get_default()
+    code, encoding = locale.getdefaultlocale()
     if encoding is None:
         encoding = 'ascii'
     try:

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ def addpackage(sitedir, name):`
`126`	`126`	`#`
`127`	`127`	`def locale_aware_defaultencoding():`
`128`	`128`	`import locale`
`129`		`- code, encoding = locale.get_default()`
	`129`	`+ code, encoding = locale.getdefaultlocale()`
`130`	`130`	`if encoding is None:`
`131`	`131`	`encoding = 'ascii'`
`132`	`132`	`try:`