Remove the long-deprecated BeautifulSoup support.

gsnedders · gsnedders · commit 17f9dba4e840 · 2013-04-09T19:56:52.000+01:00
As has been stated before, this was deprecated due to lack of
namespace support, hence making it impossible for it to represent
any tree containing foreign content.
diff --git a/html5lib/tests/support.py b/html5lib/tests/support.py
@@ -48,12 +48,6 @@
 except ImportError:
     pass
 
-try:
-    import BeautifulSoup
-    treeTypes["beautifulsoup"] = treebuilders.getTreeBuilder("beautifulsoup", fullTree=True)
-except ImportError:
-    pass
-
 def get_data_files(subdirectory, files='*.dat'):
     return glob.glob(os.path.join(test_dir,subdirectory,files))
 
diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
@@ -93,14 +93,6 @@ def PullDOMAdapter(node):
          "walker":  treewalkers.getTreeWalker("lxml")}
 except ImportError:
     pass
-
-try:
-    import BeautifulSoup
-    treeTypes["beautifulsoup"] = \
-        {"builder": treebuilders.getTreeBuilder("beautifulsoup"),
-         "walker":  treewalkers.getTreeWalker("beautifulsoup")}
-except ImportError:
-    pass
     
 #Try whatever etree implementations are available from a list that are
 #"supposed" to work
diff --git a/html5lib/treebuilders/__init__.py b/html5lib/treebuilders/__init__.py
@@ -40,7 +40,7 @@ def getTreeBuilder(treeType, implementation=None, **kwargs):
     """Get a TreeBuilder class for various types of tree with built-in support
     
     treeType - the name of the tree type required (case-insensitive). Supported
-               values are "simpletree", "dom", "etree" and "beautifulsoup"
+               values are "simpletree", "dom", and "etree"
                
                "simpletree" - a built-in DOM-ish tree type with support for some
                               more pythonic idioms.
@@ -51,7 +51,6 @@ def getTreeBuilder(treeType, implementation=None, **kwargs):
                 "etree" - A generic builder for tree implementations exposing an
                           elementtree-like interface (known to work with
                           ElementTree, cElementTree and lxml.etree).
-                "beautifulsoup" - Beautiful soup (if installed)
                
     implementation - (Currently applies to the "etree" and "dom" tree types). A
                       module implementing the tree type e.g.
@@ -70,9 +69,6 @@ def getTreeBuilder(treeType, implementation=None, **kwargs):
         elif treeType == "simpletree":
             from . import simpletree
             treeBuilderCache[treeType] = simpletree.TreeBuilder
-        elif treeType == "beautifulsoup":
-            from . import soup
-            treeBuilderCache[treeType] = soup.TreeBuilder
         elif treeType == "lxml":
             from . import etree_lxml
             treeBuilderCache[treeType] = etree_lxml.TreeBuilder
diff --git a/html5lib/treebuilders/soup.py b/html5lib/treebuilders/soup.py
diff --git a/html5lib/treewalkers/__init__.py b/html5lib/treewalkers/__init__.py
@@ -18,7 +18,7 @@ def getTreeWalker(treeType, implementation=None, **kwargs):
     """Get a TreeWalker class for various types of tree with built-in support
 
     treeType - the name of the tree type required (case-insensitive). Supported
-               values are "simpletree", "dom", "etree" and "beautifulsoup"
+               values are "simpletree", "dom", and "etree"
 
                "simpletree" - a built-in DOM-ish tree type with support for some
                               more pythonic idioms.
@@ -28,7 +28,6 @@ def getTreeWalker(treeType, implementation=None, **kwargs):
                           elementtree-like interface (known to work with
                           ElementTree, cElementTree and lxml.etree).
                 "lxml" - Optimized walker for lxml.etree
-                "beautifulsoup" - Beautiful soup (if installed)
                 "genshi" - a Genshi stream
 
     implementation - (Currently applies to the "etree" tree type only). A module
@@ -45,9 +44,6 @@ def getTreeWalker(treeType, implementation=None, **kwargs):
         elif treeType == "genshi":
             from . import genshistream
             treeWalkerCache[treeType] = genshistream.TreeWalker
-        elif treeType == "beautifulsoup":
-            from . import soup
-            treeWalkerCache[treeType] = soup.TreeWalker
         elif treeType == "lxml":
             from . import lxmletree
             treeWalkerCache[treeType] = lxmletree.TreeWalker
diff --git a/html5lib/treewalkers/soup.py b/html5lib/treewalkers/soup.py
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 with the behaviour of major desktop web browsers.
 
 Output is to a tree structure; the current release supports output to
-DOM, ElementTree, lxml and BeautifulSoup tree formats as well as a
+DOM, ElementTree, and lxml tree formats as well as a
 simple custom format"""
 
 classifiers=[
