diff options
| author | Leonard Richardson <leonardr@segfault.org> | 2013-05-20 11:30:44 -0400 |
|---|---|---|
| committer | Leonard Richardson <leonardr@segfault.org> | 2013-05-20 11:30:44 -0400 |
| commit | 32cbd5737d20c3372a488e1ecc01f7564fc0149c (patch) | |
| tree | a5718ca8fca40d240f1a38aac029649eb4f8ffef | |
| parent | 0f0ce683638ec47d87d52024a886995af114bdd7 (diff) | |
The .next_element attribute used during parsing was confusingly similar to the .next_element navigation attribute. Renamed the former to _most_recent_element.
| -rw-r--r-- | bs4/__init__.py | 20 | ||||
| -rw-r--r-- | bs4/builder/_html5lib.py | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/bs4/__init__.py b/bs4/__init__.py index 0195bcb..03b2416 100644 --- a/bs4/__init__.py +++ b/bs4/__init__.py @@ -245,14 +245,14 @@ class BeautifulSoup(Tag): o = containerClass(currentData) self.object_was_parsed(o) - def object_was_parsed(self, o, parent=None, previous_element=None): + def object_was_parsed(self, o, parent=None, most_recent_element=None): """Add an object to the parse tree.""" parent = parent or self.currentTag - previous_element = previous_element or self.previous_element - o.setup(parent, previous_element) - if self.previous_element: - self.previous_element.next_element = o - self.previous_element = o + most_recent_element = most_recent_element or self._most_recent_element + o.setup(parent, most_recent_element) + if most_recent_element is not None: + most_recent_element.next_element = o + self._most_recent_element = o parent.contents.append(o) def _popToTag(self, name, nsprefix=None, inclusivePop=True): @@ -297,12 +297,12 @@ class BeautifulSoup(Tag): return None tag = Tag(self, self.builder, name, namespace, nsprefix, attrs, - self.currentTag, self.previous_element) + self.currentTag, self._most_recent_element) if tag is None: return tag - if self.previous_element: - self.previous_element.next_element = tag - self.previous_element = tag + if self._most_recent_element: + self._most_recent_element.next_element = tag + self._most_recent_element = tag self.pushTag(tag) return tag diff --git a/bs4/builder/_html5lib.py b/bs4/builder/_html5lib.py index aa91435..e439ac8 100644 --- a/bs4/builder/_html5lib.py +++ b/bs4/builder/_html5lib.py @@ -131,7 +131,7 @@ class Element(html5lib.treebuilders._base.Node): old_element = self.element.contents[-1] new_element = self.soup.new_string(old_element + node.element) old_element.replace_with(new_element) - self.soup.previous_element = new_element + self.soup._most_recent_element = new_element else: self.soup.object_was_parsed(node.element, parent=self.element) |