Browse Source

[brightcove] fix on Python 2.6

rtmp_test
Philipp Hagemeister 12 years ago
parent
commit
5de3ece225
2 changed files with 5 additions and 5 deletions
  1. +3
    -3
      youtube_dl/extractor/brightcove.py
  2. +2
    -2
      youtube_dl/utils.py

+ 3
- 3
youtube_dl/extractor/brightcove.py View File

@ -24,13 +24,13 @@ class BrightcoveIE(InfoExtractor):
object_doc = xml.etree.ElementTree.fromstring(object_str) object_doc = xml.etree.ElementTree.fromstring(object_str)
assert u'BrightcoveExperience' in object_doc.attrib['class'] assert u'BrightcoveExperience' in object_doc.attrib['class']
params = {'flashID': object_doc.attrib['id'], params = {'flashID': object_doc.attrib['id'],
'playerID': object_doc.find('./param[@name="playerID"]').attrib['value'],
'playerID': find_xpath_attr(object_doc, './param', 'name', 'playerID').attrib['value'],
} }
playerKey = object_doc.find('./param[@name="playerKey"]')
playerKey = find_xpath_attr(object_doc, './param', 'name', 'playerKey')
# Not all pages define this value # Not all pages define this value
if playerKey is not None: if playerKey is not None:
params['playerKey'] = playerKey.attrib['value'] params['playerKey'] = playerKey.attrib['value']
videoPlayer = object_doc.find('./param[@name="@videoPlayer"]')
videoPlayer = find_xpath_attr(object_doc, './param', 'name', '@videoPlayer')
if videoPlayer is not None: if videoPlayer is not None:
params['@videoPlayer'] = videoPlayer.attrib['value'] params['@videoPlayer'] = videoPlayer.attrib['value']
data = compat_urllib_parse.urlencode(params) data = compat_urllib_parse.urlencode(params)


+ 2
- 2
youtube_dl/utils.py View File

@ -201,8 +201,8 @@ else:
if sys.version_info >= (2,7): if sys.version_info >= (2,7):
def find_xpath_attr(node, xpath, key, val): def find_xpath_attr(node, xpath, key, val):
""" Find the xpath xpath[@key=val] """ """ Find the xpath xpath[@key=val] """
assert re.match(r'^[a-z]+$', key)
assert re.match(r'^[a-z]*$', val)
assert re.match(r'^[a-zA-Z]+$', key)
assert re.match(r'^[a-zA-Z@]*$', val)
expr = xpath + u"[@%s='%s']" % (key, val) expr = xpath + u"[@%s='%s']" % (key, val)
return node.find(expr) return node.find(expr)
else: else:


Loading…
Cancel
Save