Re: [1.32][PATCH 1/1] bitbake: Fix imports from html5lib >= 0.9999999/1.0b8

* Re: [1.32][PATCH 1/1] bitbake: Fix imports from html5lib >= 0.9999999/1.0b8
@ 2017-03-23  8:39 Jussi Kukkonen
  2017-03-26 12:20 ` Richard Purdie
  0 siblings, 1 reply; 2+ messages in thread
From: Jussi Kukkonen @ 2017-03-23  8:39 UTC (permalink / raw)
  To: daniel; +Cc: bitbake-devel

[-- Attachment #1: Type: text/plain, Size: 3084 bytes --]

On 5 December 2016 at 19:42, <daniel@lublin.se> wrote:

> From: Daniel Lublin <daniel@lublin.se>
>
> 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.
>

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.

Thanks,
  Jussi

> Signed-off-by: Daniel Lublin <daniel@lublin.se>
> ---
>  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 f0e5924..2b7a70a 100644
> --- a/lib/bs4/builder/_html5lib.py
> +++ b/lib/bs4/builder/_html5lib.py
> @@ -15,7 +15,14 @@ from bs4.element import (
>      whitespace_re,
>  )
>  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,
> @@ -67,7 +74,7 @@ class HTML5TreeBuilder(HTMLTreeBuilder):
>          return '<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
> @@ -105,7 +112,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):
> @@ -137,9 +144,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
> @@ -324,7 +331,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
>
> --
> 2.10.2
>
> --
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel
>

[-- Attachment #2: Type: text/html, Size: 4419 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread