diff options
Diffstat (limited to 'bs4')
| -rw-r--r-- | bs4/element.py | 24 | ||||
| -rw-r--r-- | bs4/tests/test_tree.py | 13 |
2 files changed, 25 insertions, 12 deletions
diff --git a/bs4/element.py b/bs4/element.py index f248895..2484853 100644 --- a/bs4/element.py +++ b/bs4/element.py @@ -477,20 +477,20 @@ class PageElement(object): if isinstance(name, SoupStrainer): strainer = name - elif text is None and not limit and not attrs and not kwargs: + else: + strainer = SoupStrainer(name, attrs, text, **kwargs) + + if text is None and not limit and not attrs and not kwargs: # Optimization to find all tags. if name is True or name is None: - return [element for element in generator - if isinstance(element, Tag)] + result = (element for element in generator + if isinstance(element, Tag)) + ResultSet(strainer, result) # Optimization to find all tags with a given name. elif isinstance(name, basestring): - return [element for element in generator - if isinstance(element, Tag) and element.name == name] - else: - strainer = SoupStrainer(name, attrs, text, **kwargs) - else: - # Build a SoupStrainer - strainer = SoupStrainer(name, attrs, text, **kwargs) + result = (element for element in generator + if isinstance(element, Tag) + and element.name == name) results = ResultSet(strainer) while True: try: @@ -1602,6 +1602,6 @@ class SoupStrainer(object): class ResultSet(list): """A ResultSet is just a list that keeps track of the SoupStrainer that created it.""" - def __init__(self, source): - list.__init__([]) + def __init__(self, source, result=()): + super(list, self).__init__(result) self.source = source diff --git a/bs4/tests/test_tree.py b/bs4/tests/test_tree.py index 0acc092..1c2c93b 100644 --- a/bs4/tests/test_tree.py +++ b/bs4/tests/test_tree.py @@ -115,6 +115,19 @@ class TestFindAll(TreeTest): # recursion. self.assertEqual([], soup.find_all(l)) + def test_find_all_resultset(self): + """All find_all calls return a ResultSet""" + soup = self.soup("<a></a>") + result = soup.find_all("a") + self.assertTrue(hasattr(result, "source")) + + result = soup.find_all(True) + self.assertTrue(hasattr(result, "source")) + + result = soup.find_all(text="foo") + self.assertTrue(hasattr(result, "source")) + + class TestFindAllBasicNamespaces(TreeTest): def test_find_by_namespaced_name(self): |