From 8e636da4990643084de17c03c6a0639e9aa4085e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sat, 5 Sep 2015 00:34:49 +0600 Subject: [PATCH] [utils] Improve xpath_text --- youtube_dl/utils.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 86b7571030..cc792be6ab 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -181,7 +181,7 @@ def xpath_element(node, xpath, name=None, fatal=False, default=NO_DEFAULT): xpath = xpath.encode('ascii') n = node.find(xpath) - if n is None or n.text is None: + if n is None: if default is not NO_DEFAULT: return default elif fatal: @@ -193,7 +193,18 @@ def xpath_element(node, xpath, name=None, fatal=False, default=NO_DEFAULT): def xpath_text(node, xpath, name=None, fatal=False, default=NO_DEFAULT): - return xpath_element(node, xpath, name, fatal=fatal, default=default).text + n = xpath_element(node, xpath, name, fatal=fatal, default=default) + if n is None or n == default: + return n + if n.text is None: + if default is not NO_DEFAULT: + return default + elif fatal: + name = xpath if name is None else name + raise ExtractorError('Could not find XML element\'s text %s' % name) + else: + return None + return n.text def xpath_attr(node, xpath, key, name=None, fatal=False, default=NO_DEFAULT):