From af1588c05f308ffa2fdabaa2fc4c38673b4217d8 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 22 Jan 2014 02:04:51 +0100
Subject: [PATCH] [mtv] Update tests and xpath function for new title
extraction
---
youtube_dl/extractor/mtv.py | 2 +-
youtube_dl/extractor/spike.py | 2 +-
youtube_dl/utils.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index af889a8af..51f91ef1d 100644
--- 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 71a9aaa24..56682ac45 100644
--- 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 9ab7288cc..6c00973bd 100644
--- 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: