diff options
| -rw-r--r-- | beautifulsoup/__init__.py | 4 | ||||
| -rw-r--r-- | beautifulsoup/builder/__init__.py | 4 | ||||
| -rw-r--r-- | tests/test_tree.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/beautifulsoup/__init__.py b/beautifulsoup/__init__.py index 93a610a..234cb89 100644 --- a/beautifulsoup/__init__.py +++ b/beautifulsoup/__init__.py @@ -64,7 +64,7 @@ __all__ = ['BeautifulSoup'] import re from util import isList, isString, buildSet -from builder import registry +from builder import builder_registry from dammit import UnicodeDammit from element import Entities, NavigableString, Tag @@ -112,7 +112,7 @@ class BeautifulSoup(Tag): if builder is None: if len(features) == 0: features = self.DEFAULT_BUILDER_FEATURES - builder = registry.lookup(*features) + builder = builder_registry.lookup(*features) if builder is None: raise ValueError( "Couldn't find a tree builder with the features you " diff --git a/beautifulsoup/builder/__init__.py b/beautifulsoup/builder/__init__.py index 385dd50..b97c5f9 100644 --- a/beautifulsoup/builder/__init__.py +++ b/beautifulsoup/builder/__init__.py @@ -70,7 +70,7 @@ class TreeBuilderRegistry(object): # The BeautifulSoup class will take feature lists from developers and use them # to look up builders in this registry. -registry = TreeBuilderRegistry() +builder_registry = TreeBuilderRegistry() class TreeBuilder(Entities): @@ -243,7 +243,7 @@ def register_treebuilders_from(module): setattr(this_module, name, obj) this_module.__all__.append(name) # Register the builder while we're at it. - this_module.registry.register(obj) + this_module.builder_registry.register(obj) # Builders are registered in reverse order of priority, so that custom # builder registrations will take precedence. In general, we want diff --git a/tests/test_tree.py b/tests/test_tree.py index 0232bac..0b3d72e 100644 --- a/tests/test_tree.py +++ b/tests/test_tree.py @@ -13,7 +13,7 @@ import copy import cPickle as pickle import re from beautifulsoup import BeautifulSoup -from beautifulsoup.builder import registry +from beautifulsoup.builder import builder_registry from beautifulsoup.element import CData, SoupStrainer, Tag from beautifulsoup.testing import SoupTest @@ -524,7 +524,7 @@ class TestTreeModification(SoupTest): self.assertEqual(soup.decode(), self.document_for('<a id2="foo"></a>')) def test_new_tag_creation(self): - builder = registry.lookup('html5lib')() + builder = builder_registry.lookup('html5lib')() soup = self.soup("<body></body>", builder=builder) a = Tag(soup, builder, 'a') ol = Tag(soup, builder, 'ol') |