X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Futils.py;h=7faa046c8cf6f9a464f8de65cfd0c637664329ba;hb=bae611f216ac7b1f1a24a506da6dffc518d09d5b;hp=2853ba50f228bb1f87900aa78a256b1637fcee2b;hpb=d4e16d3e9736fd4419b8bd2b088b5dec086ae07d;p=youtube-dl diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 2853ba50f..7faa046c8 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -32,15 +32,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() + try: + pref = locale.getpreferredencoding() + u'TEST'.encode(pref) + except: + pref = 'UTF-8' + + return pref def htmlentity_transform(matchobj):