reSWIGged

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

diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index 93078afc8b6d4f6443e5386557ccaadea4adc8a6..8daf2864dbb78fb60821d08c9be193f5a0fbe849 100644 (file)
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -11216,7 +11216,10 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 import locale
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 import locale

-default = locale.getdefaultlocale()[1]
+try:
+    default = locale.getdefaultlocale()[1]
+except ValueError:
+    default = "iso8859-1"

 if default:
     wx.SetDefaultPyEncoding(default)
 del default
 if default:
     wx.SetDefaultPyEncoding(default)
 del default

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index 156109497fb23b4122412c7fec2748bb6c6748c6..663d58586d95465b658b7ff3ec5221dacebe40a0 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -11229,7 +11229,10 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 import locale
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 import locale

-default = locale.getdefaultlocale()[1]
+try:
+    default = locale.getdefaultlocale()[1]
+except ValueError:
+    default = "iso8859-1"

 if default:
     wx.SetDefaultPyEncoding(default)
 del default
 if default:
     wx.SetDefaultPyEncoding(default)
 del default