Catch possible exception from getdefaultlocale

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

diff --git a/wxPython/src/_core_ex.py b/wxPython/src/_core_ex.py
index 656a54a9913e4ef20db88e6f697540609b2adf48..f19ca7ecd7b1c3e64122a5c09b9b878ee036e70c 100644 (file)
--- a/wxPython/src/_core_ex.py
+++ b/wxPython/src/_core_ex.py
@@ -40,7 +40,10 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
 # 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

diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py
index 93078afc8b6d4f6443e5386557ccaadea4adc8a6..8daf2864dbb78fb60821d08c9be193f5a0fbe849 100644 (file)
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_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
-default = locale.getdefaultlocale()[1]
+try:
+    default = locale.getdefaultlocale()[1]
+except ValueError:
+    default = "iso8859-1"
 if default:
     wx.SetDefaultPyEncoding(default)
 del default