Try using locale.getpreferredencoding

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_core_ex.py b/wxPython/src/_core_ex.py
index bb3658d73ce2638bd120797754cdcbde44675b61..bd9ecf759eb388b2db78e59514b4e478d716bf42 100644 (file)
--- a/wxPython/src/_core_ex.py
+++ b/wxPython/src/_core_ex.py
@@ -67,7 +67,10 @@ if default == 'ascii':
     import locale
     import codecs
     try:
     import locale
     import codecs
     try:

-        default = locale.getdefaultlocale()[1]
+        if hasattr(locale, 'getpreferredencoding'):
+            default = locale.getpreferredencoding()
+        else:
+            default = locale.getdefaultlocale()[1]

         codecs.lookup(default)
     except (ValueError, LookupError, TypeError):
         default = _sys.getdefaultencoding()
         codecs.lookup(default)
     except (ValueError, LookupError, TypeError):
         default = _sys.getdefaultencoding()

diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py
index e3e8e8d1635e5c48a67cb18c72c937436569a637..dbe7f46a8c77083b58b2f81c031500dfa815c33c 100644 (file)
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -13709,7 +13709,10 @@ if default == 'ascii':
     import locale
     import codecs
     try:
     import locale
     import codecs
     try:

-        default = locale.getdefaultlocale()[1]
+        if hasattr(locale, 'getpreferredencoding'):
+            default = locale.getpreferredencoding()
+        else:
+            default = locale.getdefaultlocale()[1]

         codecs.lookup(default)
     except (ValueError, LookupError, TypeError):
         default = _sys.getdefaultencoding()
         codecs.lookup(default)
     except (ValueError, LookupError, TypeError):
         default = _sys.getdefaultencoding()

diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index e3e8e8d1635e5c48a67cb18c72c937436569a637..dbe7f46a8c77083b58b2f81c031500dfa815c33c 100644 (file)
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -13709,7 +13709,10 @@ if default == 'ascii':
     import locale
     import codecs
     try:
     import locale
     import codecs
     try:

-        default = locale.getdefaultlocale()[1]
+        if hasattr(locale, 'getpreferredencoding'):
+            default = locale.getpreferredencoding()
+        else:
+            default = locale.getdefaultlocale()[1]

         codecs.lookup(default)
     except (ValueError, LookupError, TypeError):
         default = _sys.getdefaultencoding()
         codecs.lookup(default)
     except (ValueError, LookupError, TypeError):
         default = _sys.getdefaultencoding()

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index e5794e1ae436a431d9e171cb407f51ce3df906b3..f9cf4a84381c7793fb7439f54b1a17f70b03f651 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -13713,7 +13713,10 @@ if default == 'ascii':
     import locale
     import codecs
     try:
     import locale
     import codecs
     try:

-        default = locale.getdefaultlocale()[1]
+        if hasattr(locale, 'getpreferredencoding'):
+            default = locale.getpreferredencoding()
+        else:
+            default = locale.getdefaultlocale()[1]

         codecs.lookup(default)
     except (ValueError, LookupError, TypeError):
         default = _sys.getdefaultencoding()
         codecs.lookup(default)
     except (ValueError, LookupError, TypeError):
         default = _sys.getdefaultencoding()