Merge remote-tracking branch 'anisse/fix-content-encoding-charset'

2014-04-07 23:27:03 +02:00 · 2014-04-07 23:27:03 +02:00 · aafddb2b0a
parent 6262ac8ac5 ec0fafbb19
commit aafddb2b0a
1 changed files with 4 additions and 1 deletions
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@ -251,7 +251,10 @@ class InfoExtractor(object):
            with open(filename, 'wb') as outf:
                outf.write(webpage_bytes)

-        content = webpage_bytes.decode(encoding, 'replace')
+        try:
+            content = webpage_bytes.decode(encoding, 'replace')
+        except LookupError:
+            content = webpage_bytes.decode('utf-8', 'replace')

        if (u'<title>Access to this site is blocked</title>' in content and
                u'Websense' in content[:512]):