commit f94b636c3ec6410570e5d384e66d651a89de6abe parent 0833f1eb839a6677ec2e850c763b84164df30433 Author: Ricardo Garcia <sarbalap+freshmeat@gmail.com> Date: Sun, 20 Sep 2009 00:08:50 +0200 Improve preferred encoding detection method Diffstat:
| M | youtube-dl | | | 18 | +++++++++--------- |
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/youtube-dl b/youtube-dl @@ -33,15 +33,15 @@ def preferredencoding(): Returns the best encoding scheme for the system, based on locale.getpreferredencoding() and some further tweaks. """ - try: - pref = locale.getpreferredencoding() - # Mac OSX systems have this problem sometimes - if pref == '': - return 'UTF-8' - return pref - except: - sys.stderr.write('WARNING: problem obtaining preferred encoding. Falling back to UTF-8.\n') - return 'UTF-8' + def yield_preferredencoding(): + try: + pref = locale.getpreferredencoding() + u'TEST'.encode(pref) + except: + pref = 'UTF-8' + while True: + yield pref + return yield_preferredencoding().next() class DownloadError(Exception): """Download Error exception.