X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/669e06d77ebb561f43a745a4b2b72e22ac19381d..c437fde9f90fc7dfcac79053d214fc9146d7be21:/wxPython/src/_core_ex.py

diff --git a/wxPython/src/_core_ex.py b/wxPython/src/_core_ex.py
index 656a54a991..45f7eeab6d 100644
--- a/wxPython/src/_core_ex.py
+++ b/wxPython/src/_core_ex.py
@@ -39,12 +39,21 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
 # different on different platforms.  For example, please see
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
-import locale
-default = locale.getdefaultlocale()[1]
+
+default = _sys.getdefaultencoding()
+if default == 'ascii':
+    import locale
+    import codecs
+    try:
+        default = locale.getdefaultlocale()[1]
+        codecs.lookup(default)
+    except (ValueError, LookupError):
+        default = _sys.getdefaultencoding()
+    del locale
+    del codecs
 if default:
     wx.SetDefaultPyEncoding(default)
 del default
-del locale
 
 #----------------------------------------------------------------------------