R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dfxp: fix syntax

Browse Source
This commit is contained in:
fnord 2015-07-17 03:05:24 -05:00
parent e6b0b86eb2
commit 8f057ac0bd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
youtube_dl/utils.py
View File

@ -1850,12 +1850,10 @@ def dfxp2srt(dfxp_data):
'ttaf1': 'http://www.w3.org/2006/10/ttaf1', 'ttaf1': 'http://www.w3.org/2006/10/ttaf1',
}) })
def text_or_empty(v): def text_or_empty(v):
""" return string that contains something other than whitespace, or '' """ """ return string that contains something other than whitespace, or '' """
str = str_or_none(v, '') str = str_or_none(v, '')
return '' if not re.search(r'[^\s]',str,re.DOTALL) else str return '' if not re.search(r'[^\s]', str, re.DOTALL) else str
def parse_node(node): def parse_node(node):
str_or_empty = functools.partial(str_or_none, default='') str_or_empty = functools.partial(str_or_none, default='')
@ -1872,7 +1870,7 @@ def dfxp2srt(dfxp_data):
return out return out
dfxp = xml.etree.ElementTree.fromstring(dfxp_data.replace('\n','').encode('utf-8')) dfxp = xml.etree.ElementTree.fromstring(dfxp_data.replace('\n', '').encode('utf-8'))
out = [] out = []
paras = dfxp.findall(_x('.//ttml:p')) or dfxp.findall(_x('.//ttaf1:p')) or dfxp.findall('.//p') paras = dfxp.findall(_x('.//ttml:p')) or dfxp.findall(_x('.//ttaf1:p')) or dfxp.findall('.//p')