← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/upgrade-soupmatchers into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/upgrade-soupmatchers into lp:launchpad.

Commit message:
Upgrade to soupmatchers 0.4.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/upgrade-soupmatchers/+merge/345958

This adds Python 3 support.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/upgrade-soupmatchers into lp:launchpad.
=== modified file 'constraints.txt'
--- constraints.txt	2018-05-14 11:58:37 +0000
+++ constraints.txt	2018-05-18 20:44:37 +0000
@@ -345,7 +345,7 @@
 SimpleTAL==4.3
 six==1.11.0
 snowballstemmer==1.2.1
-soupmatchers==0.2
+soupmatchers==0.4
 sphinxcontrib-websupport==1.0.1
 # lp:~launchpad-committers/storm/with-without-datetime
 storm==0.19.0.99-lpwithnodatetime-r408

=== modified file 'lib/lp/registry/browser/tests/test_distroseries.py'
--- lib/lp/registry/browser/tests/test_distroseries.py	2018-02-02 10:06:24 +0000
+++ lib/lp/registry/browser/tests/test_distroseries.py	2018-05-18 20:44:37 +0000
@@ -1541,8 +1541,7 @@
             '+localpackagediffs')
 
         radio_title = (
-            " Ignored packages with a higher version than in "
-            "'Lucid'")
+            u"\xa0Ignored packages with a higher version than in 'Lucid'")
         radio_option_matches = soupmatchers.HTMLContains(
             soupmatchers.Tag(
                 "radio displays parent's name", 'label',
@@ -1559,8 +1558,8 @@
             derived_series,
             '+localpackagediffs')
 
-        radio_title = \
-            " Ignored packages with a higher version than in parent"
+        radio_title = (
+            u"\xa0Ignored packages with a higher version than in parent")
         radio_option_matches = soupmatchers.HTMLContains(
             soupmatchers.Tag(
                 "radio displays parent's name", 'label',

=== modified file 'lib/lp/registry/browser/tests/test_product.py'
--- lib/lp/registry/browser/tests/test_product.py	2016-11-15 13:37:38 +0000
+++ lib/lp/registry/browser/tests/test_product.py	2018-05-18 20:44:37 +0000
@@ -999,7 +999,7 @@
         tag = Tag(
             'error', 'div', attrs={'class': 'message'},
             text=(
-                'The URI scheme "svn" is not allowed.  '
+                'The URI scheme "svn" is not allowed.  '
                 'Only URIs with the following schemes may be used: '
                 'git, http, https'))
         self.assertThat(browser.contents, HTMLContains(tag))


Follow ups