commit 1a9c655e3b1569f315d4193e877cba0b4a863c63 parent 88db5ef279e2cb4679b049ef3f002a3856609010 Author: Philipp Hagemeister <phihag@phihag.de> Date: Tue, 27 Nov 2012 18:48:43 +0100 Merge remote-tracking branch 'Asido/master' Diffstat:
| M | youtube_dl/utils.py | | | 16 | +++++++--------- |
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py @@ -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() + try: + pref = locale.getpreferredencoding() + u'TEST'.encode(pref) + except: + pref = 'UTF-8' + + return pref def htmlentity_transform(matchobj):