Merge branch 'master' of https://github.com/rg3/youtube-dl into bilibili

youtube_dl/extractor/bilibili.py

@@ -3,9 +3,11 @@
 
 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 @@ def _real_extract(self, url):
         except ValueError:
             pass
 
-        doc = ET.fromstring(page)
+        doc = compat_etree_fromstring(page)
 
         entries = []