Merge remote-tracking branch 'Asido/master'

This commit is contained in:
Philipp Hagemeister 2012-11-27 18:48:43 +01:00
commit 1a9c655e3b
1 changed files with 7 additions and 9 deletions

View File

@ -37,15 +37,13 @@ def preferredencoding():
Returns the best encoding scheme for the system, based on
locale.getpreferredencoding() and some further tweaks.
"""
def yield_preferredencoding():
try:
pref = locale.getpreferredencoding()
u'TEST'.encode(pref)
except:
pref = 'UTF-8'
while True:
yield pref
return yield_preferredencoding().next()
return pref
def htmlentity_transform(matchobj):