[mtv] Update tests and xpath function for new title extraction

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index af889a8afeb9f50169ceb3f59d9dee83c27fee65..51f91ef1d139e9a12352c04f9653cd59e1e90784 100644 (file)
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -180,7 +180,7 @@ class MTVIggyIE(MTVServicesInfoExtractor):
         'info_dict': {
             'id': '984696',
             'ext': 'mp4',
-            'title': 'Short',
+            'title': 'Arcade Fire: Behind the Scenes at the Biggest Music Experiment Yet',
         }
     }
     _FEED_URL = 'http://all.mtvworldverticals.com/feed-xml/'

diff --git a/youtube_dl/extractor/spike.py b/youtube_dl/extractor/spike.py
index 71a9aaa24d12398e7c1dbb7f5f3bb791db509d17..56682ac45595344c80ff06fc9861ae54469b4a95 100644 (file)
--- a/youtube_dl/extractor/spike.py
+++ b/youtube_dl/extractor/spike.py
@@ -11,7 +11,7 @@ class SpikeIE(MTVServicesInfoExtractor):
         'info_dict': {
             'id': 'b9c8221a-4e50-479a-b86d-3333323e38ba',
             'ext': 'mp4',
-            'title': 'Can Allen Ride A Hundred Year-Old Motorcycle?',
+            'title': 'Auction Hunters|Can Allen Ride A Hundred Year-Old Motorcycle?',
             'description': 'md5:fbed7e82ed5fad493615b3094a9499cb',
         },
     }

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 9ab7288cc84668f8533716ee4866d97a0ff3b6f7..6c00973bd34dd266ad2b9cf903e6caa9b8e83033 100644 (file)
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -224,7 +224,7 @@ if sys.version_info >= (2,7):
     def find_xpath_attr(node, xpath, key, val):
         """ Find the xpath xpath[@key=val] """
         assert re.match(r'^[a-zA-Z]+$', key)
-        assert re.match(r'^[a-zA-Z0-9@\s:.]*$', val)
+        assert re.match(r'^[a-zA-Z0-9@\s:._]*$', val)
         expr = xpath + u"[@%s='%s']" % (key, val)
         return node.find(expr)
 else: