X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Futils.py;h=bff59eb73320ae611249efce55993873c8d8055a;hb=7e1f5447e76e57af58bf45ce565742c813c80b99;hp=b7013a6aaef400633d45ac33c4a7fcb949802be7;hpb=7aefc49c4013efb5056b2c1237e22c52cb5d3c49;p=youtube-dl.git

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index b7013a6aa..bff59eb73 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -403,7 +403,7 @@ def _htmlentity_transform(entity):
             pass
 
     # Unknown entity in name, return its literal representation
-    return ('&%s;' % entity)
+    return '&%s;' % entity
 
 
 def unescapeHTML(s):
@@ -1668,7 +1668,9 @@ def urlencode_postdata(*args, **kargs):
 
 
 def encode_dict(d, encoding='utf-8'):
-    return dict((k.encode(encoding), v.encode(encoding)) for k, v in d.items())
+    def encode(v):
+        return v.encode(encoding) if isinstance(v, compat_basestring) else v
+    return dict((encode(k), encode(v)) for k, v in d.items())
 
 
 US_RATINGS = {