<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On 5 December 2016 at 19:42, <span dir="ltr"><<a href="mailto:daniel@lublin.se" target="_blank">daniel@lublin.se</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Daniel Lublin <<a href="mailto:daniel@lublin.se">daniel@lublin.se</a>><br>
<br>
As of html5lib 0.9999999/1.0b8 (released on July 14, 2016), some modules<br>
have moved from _base to base. Handle this, while staying compatible<br>
with earlier versions.<br></blockquote><div><br></div><div>This fixes a build breaking bug on newish host OSes and should be cherry-picked to supported releases. I've tested 1.32: applies cleanly and fixes the issue.</div><div><br></div><div>Thanks,</div><div> Jussi</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Signed-off-by: Daniel Lublin <<a href="mailto:daniel@lublin.se">daniel@lublin.se</a>><br>
---<br>
lib/bs4/builder/_html5lib.py | 17 ++++++++++++-----<br>
1 file changed, 12 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/lib/bs4/builder/_html5lib.py b/lib/bs4/builder/_html5lib.py<br>
index f0e5924..2b7a70a 100644<br>
--- a/lib/bs4/builder/_html5lib.py<br>
+++ b/lib/bs4/builder/_html5lib.py<br>
@@ -15,7 +15,14 @@ from bs4.element import (<br>
whitespace_re,<br>
)<br>
import html5lib<br>
+try:<br>
+ # html5lib >= 0.99999999/1.0b9<br>
+ from html5lib.treebuilders import base as treebuildersbase<br>
+except ImportError:<br>
+ # html5lib <= 0.9999999/1.0b8<br>
+ from html5lib.treebuilders import _base as treebuildersbase<br>
from html5lib.constants import namespaces<br>
+<br>
from bs4.element import (<br>
Comment,<br>
Doctype,<br>
@@ -67,7 +74,7 @@ class HTML5TreeBuilder(<wbr>HTMLTreeBuilder):<br>
return '<html><head></head><body>%s</<wbr>body></html>' % fragment<br>
<br>
<br>
-class TreeBuilderForHtml5lib(<wbr>html5lib.treebuilders._base.<wbr>TreeBuilder):<br>
+class TreeBuilderForHtml5lib(<wbr>treebuildersbase.TreeBuilder):<br>
<br>
def __init__(self, soup, namespaceHTMLElements):<br>
self.soup = soup<br>
@@ -105,7 +112,7 @@ class TreeBuilderForHtml5lib(<wbr>html5lib.treebuilders._base.<wbr>TreeBuilder):<br>
return self.soup<br>
<br>
def getFragment(self):<br>
- return html5lib.treebuilders._base.<wbr>TreeBuilder.getFragment(self).<wbr>element<br>
+ return treebuildersbase.TreeBuilder.<wbr>getFragment(self).element<br>
<br>
class AttrList(object):<br>
def __init__(self, element):<br>
@@ -137,9 +144,9 @@ class AttrList(object):<br>
return name in list(self.attrs.keys())<br>
<br>
<br>
-class Element(html5lib.treebuilders.<wbr>_base.Node):<br>
+class Element(treebuildersbase.Node)<wbr>:<br>
def __init__(self, element, soup, namespace):<br>
- html5lib.treebuilders._base.<wbr>Node.__init__(self, <a href="http://element.name" rel="noreferrer" target="_blank">element.name</a>)<br>
+ treebuildersbase.Node.__init__<wbr>(self, <a href="http://element.name" rel="noreferrer" target="_blank">element.name</a>)<br>
self.element = element<br>
self.soup = soup<br>
self.namespace = namespace<br>
@@ -324,7 +331,7 @@ class Element(html5lib.treebuilders.<wbr>_base.Node):<br>
<br>
class TextNode(Element):<br>
def __init__(self, element, soup):<br>
- html5lib.treebuilders._base.<wbr>Node.__init__(self, None)<br>
+ treebuildersbase.Node.__init__<wbr>(self, None)<br>
self.element = element<br>
self.soup = soup<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.10.2<br>
<br>
--<br>
______________________________<wbr>_________________<br>
bitbake-devel mailing list<br>
<a href="mailto:bitbake-devel@lists.openembedded.org">bitbake-devel@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/bitbake-devel" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/bitbake-devel</a><br>
</font></span></blockquote></div><br></div></div>