Merge ~ahasenack/ubuntu/+source/soupsieve:eoan-soupsieve-fix-lxml4.4.0+-tests into ~ahasenack/ubuntu/+source/soupsieve:master

[Andreas Hasenack]

This package is not yet imported into git-ubuntu, so I'm doing this MP against my own master branch.

Grabbed the fix from upstream to fix the DEP8 test failures when run with lxml 4.4.1 from eoan-proposed. Upstream's 1.9.3 (which is in debian) has the fix, but the changelog (and diff) tells me there are changes would require a feature freeze exception. In particular, the dropping of an undocumented feature ("quirks"):

https://github.com/facelessuser/soupsieve/compare/1.9.2...1.9.3

Since I'm not familiar with this package, and was able to get the exact fix needed from an upstream commit, I think it's best to not update the version at this time.

Local dep8 run with eoan-proposed enabled:

$ grep lxml.*4.4.* dep8-with-patch/log |head -n 1
Get:93 http://archive.ubuntu.com/ubuntu eoan-proposed/universe amd64 python-lxml amd64 4.4.1-1 [946 kB]

$ tail dep8-with-patch/log
    for el in sv.select('> span, > #pre', el, flags=sv.DEBUG | sv._QUIRKS):

-- Docs: https://docs.pytest.org/en/latest/warnings.html
============== 658 passed, 4 skipped, 11 warnings in 4.43 seconds ==============
autopkgtest [11:21:40]: test unittests3: -----------------------]
autopkgtest [11:21:40]: test unittests3: - - - - - - - - - - results - - - - - - - - - -
unittests3 PASS
autopkgtest [11:21:40]: @@@@@@@@@@@@@@@@@@@@ summary
unittests PASS
unittests3 PASS

Without the patch I get the same failure that is occurring in britney right now.

[Robie Basak (racb)]

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Uploading d57d28c4e56a88c3d6fb8072e17e2a8346f1ef48 from this branch. No upload tag since the package isn't imported.

$ dput ubuntu soupsieve_1.9.2+dfsg-2ubuntu1_source.changes
Checking signature on .changes
gpg: /home/ubuntu/soupsieve_1.9.2+dfsg-2ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: /home/ubuntu/soupsieve_1.9.2+dfsg-2ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading soupsieve_1.9.2+dfsg-2ubuntu1.dsc: done.
  Uploading soupsieve_1.9.2+dfsg-2ubuntu1.debian.tar.xz: done.
  Uploading soupsieve_1.9.2+dfsg-2ubuntu1_source.buildinfo: done.
  Uploading soupsieve_1.9.2+dfsg-2ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index d00edde..a9366e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+soupsieve (1.9.2+dfsg-2ubuntu1) eoan; urgency=medium
+
+  * d/p/fix-test_defined_xhtml-with-newer-lxml.patch: fix
+    test_defined_xhtml with lxml 4.4.0+.  Thanks to Isaac Muse
+    <[e-mail]>. (LP: #1842076)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 30 Aug 2019 11:06:20 -0300
+
 soupsieve (1.9.2+dfsg-2) unstable; urgency=medium
 
   * Drop pypy binary package, Debian is pruning python 2 modules, where
diff --git a/debian/control b/debian/control
index ddd1b8d..31e4ce0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: soupsieve
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders: Stefano Rivera <[e-mail]>
 Build-Depends:
  debhelper-compat (= 12),
diff --git a/debian/patches/fix-test_defined_xhtml-with-newer-lxml.patch b/debian/patches/fix-test_defined_xhtml-with-newer-lxml.patch
new file mode 100644
index 0000000..7e5465e
--- /dev/null
+++ b/debian/patches/fix-test_defined_xhtml-with-newer-lxml.patch
@@ -0,0 +1,41 @@
+Description: fix test_defined_xhtml with lxml 4.4.0+
+ Ubuntu note: dropped the other changes in that commit, keeping only
+ the fix for the test issue.
+Origin: upstream, https://github.com/facelessuser/soupsieve/commit/b9fddc053f7d5d7589245ba8e92cf7df639bf260
+Author: Isaac Muse <[e-mail]>
+Bug: https://github.com/facelessuser/soupsieve/pull/152
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/soupsieve/+bug/1842076
+Last-Update: 2019-08-30
+diff --git a/tests/test_level4/test_defined.py b/tests/test_level4/test_defined.py
+index 12b992a..4a5568d 100644
+--- a/tests/test_level4/test_defined.py
++++ b/tests/test_level4/test_defined.py
+@@ -45,21 +46,23 @@ class TestDefined(util.TestCase):
+         <div-custom id="1"></div-custom>
+         <prefix:div id="2"></prefix:div>
+         <!--
+-        lxml or BeautifulSoup seems to strip away the prefix.
+-        This is most likely because prefix with no namespace is not really valid.
++        lxml seems to strip away the prefix in versions less than 4.4.0.
++        This was most likely because prefix with no namespace is not really valid.
+         XML does allow colons in names, but encourages them to be used for namespaces.
+-        Do we really care that the prefix is wiped out in XHTML if there is no namespace?
+-        If we do, we should look into this in the future.
++        This is a quirk of LXML, but it appears to be fine in 4.4.0+.
+         -->
+         <prefix:div-custom id="3"></prefix:div-custom>
+         </body>
+         </html>
+         """
+ 
++        from lxml import etree
++
+         self.assert_selector(
+             markup,
+             'body :defined',
+-            ['0', '2'],  # We should get 3, but we don't for reasons stated above.
++            # We should get 3, but for LXML versions less than 4.4.0 we don't for reasons stated above.
++            ['0', '2'] if etree.LXML_VERSION < (4, 4, 0, 0) else ['0', '1', '2'],
+             flags=util.XHTML
+         )
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..84c89ad
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-test_defined_xhtml-with-newer-lxml.patch