diff options
| author | Leonard Richardson <leonard.richardson@canonical.com> | 2011-05-21 11:15:56 -0400 |
|---|---|---|
| committer | Leonard Richardson <leonard.richardson@canonical.com> | 2011-05-21 11:15:56 -0400 |
| commit | 550eebcc806a161cbf5e5ac7eb441cdf987a995b (patch) | |
| tree | 59b0c7e7dd36f9aa0afd2e632778620ff3aa82ce | |
| parent | b01f9312a13198d249060dac34ab12629285cdb2 (diff) | |
| parent | 640fdc0fa7f2ffd53fb92dbeac8b456bb09dcaa7 (diff) | |
Merged in the removal of util.py.
| -rw-r--r-- | bs4/__init__.py | 3 | ||||
| -rw-r--r-- | bs4/element.py | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/bs4/__init__.py b/bs4/__init__.py index e0eba75..8baeec4 100644 --- a/bs4/__init__.py +++ b/bs4/__init__.py @@ -27,7 +27,6 @@ __all__ = ['BeautifulSoup'] import re -from util import isList, buildSet from builder import builder_registry from dammit import UnicodeDammit from element import DEFAULT_OUTPUT_ENCODING, NavigableString, Tag @@ -145,7 +144,7 @@ class BeautifulSoup(Tag): if self.currentData: currentData = u''.join(self.currentData) if (currentData.translate(self.STRIP_ASCII_SPACES) == '' and - not buildSet([tag.name for tag in self.tagStack]).intersection( + not set([tag.name for tag in self.tagStack]).intersection( self.builder.preserve_whitespace_tags)): if '\n' in currentData: currentData = '\n' diff --git a/bs4/element.py b/bs4/element.py index 6fb6210..587078c 100644 --- a/bs4/element.py +++ b/bs4/element.py @@ -6,8 +6,6 @@ except ImportError: name2codepoint = {} from bs4.dammit import EntitySubstitution -from util import isList - DEFAULT_OUTPUT_ENCODING = "utf-8" @@ -771,7 +769,7 @@ class SoupStrainer(object): found = None # If given a list of items, scan it for a text element that # matches. - if isList(markup) and not isinstance(markup, Tag): + if hasattr(markup, '__iter__') and not isinstance(markup, Tag): for element in markup: if isinstance(element, NavigableString) \ and self.search(element): @@ -810,7 +808,7 @@ class SoupStrainer(object): if hasattr(matchAgainst, 'match'): # It's a regexp object. result = markup and matchAgainst.search(markup) - elif (isList(matchAgainst) + elif (hasattr(matchAgainst, '__iter__') and (markup is not None or not isinstance(matchAgainst, basestring))): result = markup in matchAgainst |