Try using locale.getpreferredencoding

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-12-05 20:42:32 +00:00
parent 30e24d9dd5
commit 474e2ff2c8
4 changed files with 16 additions and 4 deletions

View File

@@ -67,7 +67,10 @@ if default == 'ascii':
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()

View File

@@ -13709,7 +13709,10 @@ if default == 'ascii':
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()

View File

@@ -13709,7 +13709,10 @@ if default == 'ascii':
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()

View File

@@ -13713,7 +13713,10 @@ if default == 'ascii':
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()