[Python-checkins] CVS: python/dist/src/Lib locale.py,1.9,1.10 site.py,1.12,1.13
Fredrik Lundh
python-dev@python.org
2000年7月10日 12:32:22 -0700
Update of /cvsroot/python/python/dist/src/Lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv31795/lib
Modified Files:
locale.py site.py
Log Message:
-- removed get_default compatibility kludge
-- added a few extra comments to locale.py
Index: locale.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/locale.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** locale.py 2000年07月09日 23:16:10 1.9
--- locale.py 2000年07月10日 19:32:19 1.10
***************
*** 291,297 ****
--- 291,300 ----
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
***************
*** 307,312 ****
return _parse_localename(localename)
- # compatibility
- get_default = getdefaultlocale
def getlocale(category=LC_CTYPE):
--- 310,313 ----
Index: site.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/site.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** site.py 2000年06月28日 14:48:01 1.12
--- site.py 2000年07月10日 19:32:19 1.13
***************
*** 127,131 ****
def locale_aware_defaultencoding():
import locale
! code, encoding = locale.get_default()
if encoding is None:
encoding = 'ascii'
--- 127,131 ----
def locale_aware_defaultencoding():
import locale
! code, encoding = locale.getdefaultlocale()
if encoding is None:
encoding = 'ascii'