From: Arvydas Sidorenko <asido4@gmail.com>
Date: Sun, 1 Jul 2012 16:21:27 +0000 (+0200)
Subject: Simplified preferredencoding()
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=bae611f216ac7b1f1a24a506da6dffc518d09d5b;p=youtube-dl.git

Simplified preferredencoding()

Not sure what is the point to use yield to return encoding, thus
it will simplify the whole function.

Signed-off-by: Arvydas Sidorenko <asido4@gmail.com>
---

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):