Changeset 60 for python/trunk/Lib

Timestamp:

Oct 22, 2010, 10:46:09 PM (15 years ago)

Author:

Yuri Dario

Message:

python: use current codepage as charset in locale settings.

Location:

python/trunk/Lib

Files:

• gettext.py (modified) (1 diff)
• locale.py (modified) (2 diffs)

python/trunk/Lib/gettext.py

@@ -150 +150 @@
     else:
         codeset = ''
+        
+    # use new os2 code to get current codepage
+    if pos == -1 and os.name == "os2":
+        import _locale
+        codeset = _locale._getdefaultlocale()[1]
+        mask |= COMPONENT_CODESET
+
     pos = locale.find('_')
     if pos >= 0:

python/trunk/Lib/locale.py

@@ -342 +342 @@
         encoding = ''
 
+    if sys.platform[:3] == "os2":
+        import _locale
+        langname, encoding = _locale._getdefaultlocale()
+        langname = langname.replace('_euro', '')
+
     # First lookup: fullname (possibly with encoding)
     norm_encoding = encoding.replace('-', '')
@@ -523 +528 @@
     _setlocale(category, _build_localename(getdefaultlocale()))
 
-if sys.platform in ('win32', 'darwin', 'mac'):
+if sys.platform in ('win32', 'darwin', 'mac', 'os2knix'):
     # On Win32, this will return the ANSI code page
     # On the Mac, it should return the system encoding;