commit 12ea2f30cfcc381eb46cc99a0a4c3d468fe732d1
parent 9c3e87039312e34263dbae0c9da3419e909d1001
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 4 Nov 2014 23:20:39 +0100
[utils] Remove unused get_meta_content function
Diffstat:
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/test/test_utils.py b/test/test_utils.py
@@ -20,7 +20,6 @@ from youtube_dl.utils import (
encodeFilename,
find_xpath_attr,
fix_xml_ampersands,
- get_meta_content,
orderedSet,
OnDemandPagedList,
InAdvancePagedList,
@@ -155,17 +154,6 @@ class TestUtil(unittest.TestCase):
self.assertEqual(find_xpath_attr(doc, './/node', 'x', 'a'), doc[1])
self.assertEqual(find_xpath_attr(doc, './/node', 'y', 'c'), doc[2])
- def test_meta_parser(self):
- testhtml = '''
- <head>
- <meta name="description" content="foo & bar">
- <meta content='Plato' name='author'/>
- </head>
- '''
- get_meta = lambda name: get_meta_content(name, testhtml)
- self.assertEqual(get_meta('description'), 'foo & bar')
- self.assertEqual(get_meta('author'), 'Plato')
-
def test_xpath_with_ns(self):
testxml = '''<root xmlns:media="http://example.com/">
<media:song>
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
@@ -231,10 +231,12 @@ if sys.version_info < (2, 7, 3):
if self.rawdata[i:].startswith("</scr'+'ipt>")
else compat_html_parser.HTMLParser.parse_endtag(self, i))
+
def get_element_by_id(id, html):
"""Return the content of the tag with the specified ID in the passed HTML document"""
return get_element_by_attribute("id", id, html)
+
def get_element_by_attribute(attribute, value, html):
"""Return the content of the tag with the specified attribute in the passed HTML document"""
parser = AttrParser(attribute, value)
@@ -265,16 +267,6 @@ class MetaParser(BaseHTMLParser):
def get_result(self):
return self.result
-def get_meta_content(name, html):
- """
- Return the content attribute from the meta tag with the given name attribute.
- """
- parser = MetaParser(name)
- try:
- parser.loads(html)
- except compat_html_parser.HTMLParseError:
- pass
- return parser.get_result()
def clean_html(html):
