Imported Upstream version 2015.11.27.1

[youtubedl] / youtube_dl / extractor / bilibili.py

diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py
index ecc17ebebca9e1819fc804f37d48dcceb80c44c5..6c66a12368ea0a963d89ef5922c9d83f3019ddfc 100644 (file)
--- a/youtube_dl/extractor/bilibili.py
+++ b/youtube_dl/extractor/bilibili.py
@@ -4,9 +4,11 @@ from __future__ import unicode_literals
 import re
 import itertools
 import json
 import re
 import itertools
 import json

-import xml.etree.ElementTree as ET

 
 from .common import InfoExtractor
 
 from .common import InfoExtractor

+from ..compat import (
+    compat_etree_fromstring,
+)

 from ..utils import (
     int_or_none,
     unified_strdate,
 from ..utils import (
     int_or_none,
     unified_strdate,


@@ -88,7 +90,7 @@ class BiliBiliIE(InfoExtractor):
         except ValueError:
             pass
 
         except ValueError:
             pass
 

-        lq_doc = ET.fromstring(lq_page)
+        lq_doc = compat_etree_fromstring(lq_page)

         lq_durls = lq_doc.findall('./durl')
 
         hq_doc = self._download_xml(
         lq_durls = lq_doc.findall('./durl')
 
         hq_doc = self._download_xml(