aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/common.py
diff options
context:
space:
mode:
authorAllan Zhou <allanzp@gmail.com>2013-08-30 17:51:59 -0700
committerAllan Zhou <allanzp@gmail.com>2013-08-30 17:51:59 -0700
commit85f03346ebe38c0b4cd46ab64bf9b5825d12895a (patch)
tree2aa3c34c3380174cbb10df809c7607f26c19b018 /youtube_dl/extractor/common.py
parentbdc6b3fc64a03045b8130cdc824ee3f6c15eeff1 (diff)
parent10f5c016ec6262e5d29327e97fe4f3d1127ccdff (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/common.py')
-rw-r--r--youtube_dl/extractor/common.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index a2986cebe..77726ee24 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -150,7 +150,7 @@ class InfoExtractor(object):
if m:
encoding = m.group(1)
else:
- m = re.search(br'<meta[^>]+charset="?([^"]+)[ /">]',
+ m = re.search(br'<meta[^>]+charset=[\'"]?([^\'")]+)[ /\'">]',
webpage_bytes[:1024])
if m:
encoding = m.group(1).decode('ascii')