meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/poky/bitbake/lib/bs4/__init__.py b/poky/bitbake/lib/bs4/__init__.py
index f6fdfd5..e35725b 100644
--- a/poky/bitbake/lib/bs4/__init__.py
+++ b/poky/bitbake/lib/bs4/__init__.py
@@ -427,7 +427,7 @@
if self.is_xml:
# Print the XML declaration
encoding_part = ''
- if eventual_encoding != None:
+ if eventual_encoding is not None:
encoding_part = ' encoding="%s"' % eventual_encoding
prefix = '<?xml version="1.0"%s?>\n' % encoding_part
else:
diff --git a/poky/bitbake/lib/bs4/builder/_html5lib.py b/poky/bitbake/lib/bs4/builder/_html5lib.py
index 2b7a70a..9e9216e 100644
--- a/poky/bitbake/lib/bs4/builder/_html5lib.py
+++ b/poky/bitbake/lib/bs4/builder/_html5lib.py
@@ -2,7 +2,6 @@
'HTML5TreeBuilder',
]
-from pdb import set_trace
import warnings
from bs4.builder import (
PERMISSIVE,
@@ -322,7 +321,7 @@
return self.element.contents
def getNameTuple(self):
- if self.namespace == None:
+ if self.namespace is None:
return namespaces["html"], self.name
else:
return self.namespace, self.name
diff --git a/poky/bitbake/lib/bs4/dammit.py b/poky/bitbake/lib/bs4/dammit.py
index 805aa90..7ad9e0d 100644
--- a/poky/bitbake/lib/bs4/dammit.py
+++ b/poky/bitbake/lib/bs4/dammit.py
@@ -8,12 +8,10 @@
"""
__license__ = "MIT"
-from pdb import set_trace
import codecs
from html.entities import codepoint2name
import re
import logging
-import string
# Import a library to autodetect character encodings.
chardet_type = None
@@ -38,12 +36,6 @@
def chardet_dammit(s):
return None
-# Available from http://cjkpython.i18n.org/.
-try:
- import iconv_codec
-except ImportError:
- pass
-
xml_encoding_re = re.compile(
r'^<\?.*encoding=[\'"](.*?)[\'"].*\?>'.encode(), re.I)
html_meta_re = re.compile(
diff --git a/poky/bitbake/lib/bs4/element.py b/poky/bitbake/lib/bs4/element.py
index 3775a60..68be42d 100644
--- a/poky/bitbake/lib/bs4/element.py
+++ b/poky/bitbake/lib/bs4/element.py
@@ -1,6 +1,5 @@
__license__ = "MIT"
-from pdb import set_trace
import collections.abc
import re
import sys
diff --git a/poky/bitbake/lib/bs4/testing.py b/poky/bitbake/lib/bs4/testing.py
index 3a2f260..953bca8 100644
--- a/poky/bitbake/lib/bs4/testing.py
+++ b/poky/bitbake/lib/bs4/testing.py
@@ -4,7 +4,6 @@
import pickle
import copy
-import functools
import unittest
from unittest import TestCase
from bs4 import BeautifulSoup
diff --git a/poky/bitbake/lib/bs4/tests/test_docs.py b/poky/bitbake/lib/bs4/tests/test_docs.py
index 5b9f677..d1d76a3 100644
--- a/poky/bitbake/lib/bs4/tests/test_docs.py
+++ b/poky/bitbake/lib/bs4/tests/test_docs.py
@@ -7,19 +7,15 @@
'additional_tests',
]
-import atexit
import doctest
-import os
#from pkg_resources import (
# resource_filename, resource_exists, resource_listdir, cleanup_resources)
-import unittest
DOCTEST_FLAGS = (
doctest.ELLIPSIS |
doctest.NORMALIZE_WHITESPACE |
doctest.REPORT_NDIFF)
-
# def additional_tests():
# "Run the doc tests (README.txt and docs/*, if any exist)"
# doctest_files = [
diff --git a/poky/bitbake/lib/bs4/tests/test_htmlparser.py b/poky/bitbake/lib/bs4/tests/test_htmlparser.py
index b45e35f..30a25e6 100644
--- a/poky/bitbake/lib/bs4/tests/test_htmlparser.py
+++ b/poky/bitbake/lib/bs4/tests/test_htmlparser.py
@@ -1,7 +1,6 @@
"""Tests to ensure that the html.parser tree builder generates good
trees."""
-from pdb import set_trace
import pickle
from bs4.testing import SoupTest, HTMLTreeBuilderSmokeTest
from bs4.builder import HTMLParserTreeBuilder
diff --git a/poky/bitbake/lib/bs4/tests/test_lxml.py b/poky/bitbake/lib/bs4/tests/test_lxml.py
index 6c2a1d7..6b6cdd0 100644
--- a/poky/bitbake/lib/bs4/tests/test_lxml.py
+++ b/poky/bitbake/lib/bs4/tests/test_lxml.py
@@ -1,6 +1,5 @@
"""Tests to ensure that the lxml tree builder generates good trees."""
-import re
import warnings
try:
@@ -14,13 +13,8 @@
if LXML_PRESENT:
from bs4.builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
-from bs4 import (
- BeautifulSoup,
- BeautifulStoneSoup,
- )
-from bs4.element import Comment, Doctype, SoupStrainer
+from bs4 import BeautifulStoneSoup
from bs4.testing import skipIf
-from bs4.tests import test_htmlparser
from bs4.testing import (
HTMLTreeBuilderSmokeTest,
XMLTreeBuilderSmokeTest,
diff --git a/poky/bitbake/lib/bs4/tests/test_soup.py b/poky/bitbake/lib/bs4/tests/test_soup.py
index f87949e..6ad3cb3 100644
--- a/poky/bitbake/lib/bs4/tests/test_soup.py
+++ b/poky/bitbake/lib/bs4/tests/test_soup.py
@@ -1,16 +1,12 @@
# -*- coding: utf-8 -*-
"""Tests of Beautiful Soup as a whole."""
-from pdb import set_trace
import logging
import unittest
import sys
import tempfile
-from bs4 import (
- BeautifulSoup,
- BeautifulStoneSoup,
-)
+from bs4 import BeautifulSoup
from bs4.element import (
CharsetMetaAttributeValue,
ContentMetaAttributeValue,
diff --git a/poky/bitbake/lib/bs4/tests/test_tree.py b/poky/bitbake/lib/bs4/tests/test_tree.py
index 6d3e67f..8e5c664 100644
--- a/poky/bitbake/lib/bs4/tests/test_tree.py
+++ b/poky/bitbake/lib/bs4/tests/test_tree.py
@@ -9,16 +9,12 @@
methods tested here.
"""
-from pdb import set_trace
import copy
import pickle
import re
import warnings
from bs4 import BeautifulSoup
-from bs4.builder import (
- builder_registry,
- HTMLParserTreeBuilder,
-)
+from bs4.builder import builder_registry
from bs4.element import (
PY3K,
CData,
@@ -29,10 +25,7 @@
SoupStrainer,
Tag,
)
-from bs4.testing import (
- SoupTest,
- skipIf,
-)
+from bs4.testing import SoupTest
XML_BUILDER_PRESENT = (builder_registry.lookup("xml") is not None)
LXML_PRESENT = (builder_registry.lookup("lxml") is not None)