Only use locale.getdefaultlocale()[1] if sys.getdefaultencoding() is

still "ascii"


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-03-24 16:45:57 +00:00
parent 6c56259a08
commit dd898dd8bd

View File

@@ -39,18 +39,21 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
# different on different platforms. For example, please see # different on different platforms. For example, please see
# http://www.alanwood.net/demos/charsetdiffs.html for differences # http://www.alanwood.net/demos/charsetdiffs.html for differences
# between the common latin/roman encodings. # between the common latin/roman encodings.
import locale
import codecs default = _sys.getdefaultencoding()
try: if default == 'ascii':
default = locale.getdefaultlocale()[1] import locale
codecs.lookup(default) import codecs
except (ValueError, LookupError): try:
default = _sys.getdefaultencoding() default = locale.getdefaultlocale()[1]
codecs.lookup(default)
except (ValueError, LookupError):
default = _sys.getdefaultencoding()
del locale
del codecs
if default: if default:
wx.SetDefaultPyEncoding(default) wx.SetDefaultPyEncoding(default)
del default del default
del locale
del codecs
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------