about summary refs log tree commit diff
path: root/youtube_dl/extractor/bilibili.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-12-03 20:05:11 +0100
committerremitamine <remitamine@gmail.com>2015-12-03 20:05:11 +0100
commit640bb54e73779f4a941eae1f17e4be049ca575db (patch)
treeba0c50db3ad5bb0932a56cda66d4f386b145bb22 /youtube_dl/extractor/bilibili.py
parent497f5fd93fe1efd0df8dc58d518c328ed1409457 (diff)
parente0977d7686e5df524b1a024484e7a4bb9cfa261d (diff)
downloadyoutube-dl-640bb54e73779f4a941eae1f17e4be049ca575db.tar.gz
youtube-dl-640bb54e73779f4a941eae1f17e4be049ca575db.tar.xz
youtube-dl-640bb54e73779f4a941eae1f17e4be049ca575db.zip
Merge branch 'master' of https://github.com/rg3/youtube-dl into bilibili
Diffstat (limited to 'youtube_dl/extractor/bilibili.py')
-rw-r--r--youtube_dl/extractor/bilibili.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py
index 935fcc55c..1c3644587 100644
--- a/youtube_dl/extractor/bilibili.py
+++ b/youtube_dl/extractor/bilibili.py
@@ -3,9 +3,11 @@ from __future__ import unicode_literals
 
 import re
 import json
-import xml.etree.ElementTree as ET
 
 from .common import InfoExtractor
+from ..compat import (
+    compat_etree_fromstring,
+)
 from ..utils import (
     int_or_none,
     unescapeHTML,
@@ -68,7 +70,7 @@ class BiliBiliIE(InfoExtractor):
         except ValueError:
             pass
 
-        doc = ET.fromstring(page)
+        doc = compat_etree_fromstring(page)
 
         entries = []