Merge remote-tracking branch 'Asido/master'

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:
-		try:
+		pref = locale.getpreferredencoding()
-			pref = locale.getpreferredencoding()
+		u'TEST'.encode(pref)
-			u'TEST'.encode(pref)
+	except:
-		except:
+		pref = 'UTF-8'
-			pref = 'UTF-8'
+
-		while True:
+	return pref
-			yield pref
-	return yield_preferredencoding().next()
 
 
 def htmlentity_transform(matchobj):