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

[youtube-dl] / youtube_dl / InfoExtractors.py

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index f72defdf278afd1a3b1c3fa4ed7673cd4f5316c7..e380f62a1f02b6fec3575876db0931a1fa4a74cb 100755 (executable)
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -3694,10 +3694,9 @@ class SteamIE(InfoExtractor):
         videourl = 'http://store.steampowered.com/video/%s/' % gameID
         webpage = self._download_webpage(videourl, gameID)
         mweb = re.finditer(urlRE, webpage)
-        namesRE = r'<span class="title">(?P<videoName>.+)</span>'
-        titles = list(re.finditer(namesRE, webpage))
+        namesRE = r'<span class="title">(?P<videoName>.+?)</span>'
+        titles = re.finditer(namesRE, webpage)
         videos = []
-        unescaper = compat_html_parser.HTMLParser()
         for vid,vtitle in zip(mweb,titles):
             video_id = vid.group('videoID')
             title = vtitle.group('videoName')
@@ -3708,7 +3707,7 @@ class SteamIE(InfoExtractor):
                 'id':video_id,
                 'url':video_url,
                 'ext': 'flv',
-                'title': unescaper.unescape(title)
+                'title': unescapeHTML(title)
                   }
             videos.append(info)
         return videos