[oe-commits] [bitbake] branch 1.30 updated: lib/bs4: Fix imports from html5lib >= 0.9999999/1.0b8

Mon Sep 4 16:52:27 UTC 2017

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch 1.30
in repository bitbake.

The following commit(s) were added to refs/heads/1.30 by this push:
     new a37d0f0  lib/bs4: Fix imports from html5lib >= 0.9999999/1.0b8
a37d0f0 is described below

commit a37d0f0247c9174fec124789b7a07c792193d909
Author: Daniel Lublin <daniel at lublin.se>
AuthorDate: Mon Sep 4 12:44:12 2017 +0100

    lib/bs4: Fix imports from html5lib >= 0.9999999/1.0b8
    
    As of html5lib 0.9999999/1.0b8 (released on July 14, 2016), some modules
    have moved from _base to base. Handle this, while staying compatible
    with earlier versions.
    
    Signed-off-by: Daniel Lublin <daniel at lublin.se>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bs4/builder/_html5lib.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/bs4/builder/_html5lib.py b/lib/bs4/builder/_html5lib.py
index 7de36ae..0f4007a 100644
--- a/lib/bs4/builder/_html5lib.py
+++ b/lib/bs4/builder/_html5lib.py
@@ -11,7 +11,14 @@ from bs4.builder import (
     )
 from bs4.element import NamespacedAttribute
 import html5lib
+try:
+    # html5lib >= 0.99999999/1.0b9
+    from html5lib.treebuilders import base as treebuildersbase
+except ImportError:
+    # html5lib <= 0.9999999/1.0b8
+    from html5lib.treebuilders import _base as treebuildersbase
 from html5lib.constants import namespaces
+
 from bs4.element import (
     Comment,
     Doctype,
@@ -54,7 +61,7 @@ class HTML5TreeBuilder(HTMLTreeBuilder):
         return u'<html><head></head><body>%s</body></html>' % fragment
 
 
-class TreeBuilderForHtml5lib(html5lib.treebuilders._base.TreeBuilder):
+class TreeBuilderForHtml5lib(treebuildersbase.TreeBuilder):
 
     def __init__(self, soup, namespaceHTMLElements):
         self.soup = soup
@@ -92,7 +99,7 @@ class TreeBuilderForHtml5lib(html5lib.treebuilders._base.TreeBuilder):
         return self.soup
 
     def getFragment(self):
-        return html5lib.treebuilders._base.TreeBuilder.getFragment(self).element
+        return treebuildersbase.TreeBuilder.getFragment(self).element
 
 class AttrList(object):
     def __init__(self, element):
@@ -115,9 +122,9 @@ class AttrList(object):
         return name in list(self.attrs.keys())
 
 
-class Element(html5lib.treebuilders._base.Node):
+class Element(treebuildersbase.Node):
     def __init__(self, element, soup, namespace):
-        html5lib.treebuilders._base.Node.__init__(self, element.name)
+        treebuildersbase.Node.__init__(self, element.name)
         self.element = element
         self.soup = soup
         self.namespace = namespace
@@ -277,7 +284,7 @@ class Element(html5lib.treebuilders._base.Node):
 
 class TextNode(Element):
     def __init__(self, element, soup):
-        html5lib.treebuilders._base.Node.__init__(self, None)
+        treebuildersbase.Node.__init__(self, None)
         self.element = element
         self.soup = soup
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
