Launchpad itself

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

  1. upgrade-soupmatchers
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18661
Proposed branch: lp:~cjwatson/launchpad/upgrade-soupmatchers
Merge into: lp:launchpad
Diff against target: 50 lines (+5/-6)
3 files modified
constraints.txt (+1/-1)
lib/lp/registry/browser/tests/test_distroseries.py (+3/-4)
lib/lp/registry/browser/tests/test_product.py (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/upgrade-soupmatchers
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+345958@code.launchpad.net

Commit message

Upgrade to soupmatchers 0.4.

Description of the change

This adds Python 3 support.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'constraints.txt'
2--- constraints.txt 2018-05-14 11:58:37 +0000
3+++ constraints.txt 2018-05-18 20:44:37 +0000
4@@ -345,7 +345,7 @@
5 SimpleTAL==4.3
6 six==1.11.0
7 snowballstemmer==1.2.1
8-soupmatchers==0.2
9+soupmatchers==0.4
10 sphinxcontrib-websupport==1.0.1
11 # lp:~launchpad-committers/storm/with-without-datetime
12 storm==0.19.0.99-lpwithnodatetime-r408
13
14=== modified file 'lib/lp/registry/browser/tests/test_distroseries.py'
15--- lib/lp/registry/browser/tests/test_distroseries.py 2018-02-02 10:06:24 +0000
16+++ lib/lp/registry/browser/tests/test_distroseries.py 2018-05-18 20:44:37 +0000
17@@ -1541,8 +1541,7 @@
18 '+localpackagediffs')
19
20 radio_title = (
21- " Ignored packages with a higher version than in "
22- "'Lucid'")
23+ u"\xa0Ignored packages with a higher version than in 'Lucid'")
24 radio_option_matches = soupmatchers.HTMLContains(
25 soupmatchers.Tag(
26 "radio displays parent's name", 'label',
27@@ -1559,8 +1558,8 @@
28 derived_series,
29 '+localpackagediffs')
30
31- radio_title = \
32- " Ignored packages with a higher version than in parent"
33+ radio_title = (
34+ u"\xa0Ignored packages with a higher version than in parent")
35 radio_option_matches = soupmatchers.HTMLContains(
36 soupmatchers.Tag(
37 "radio displays parent's name", 'label',
38
39=== modified file 'lib/lp/registry/browser/tests/test_product.py'
40--- lib/lp/registry/browser/tests/test_product.py 2016-11-15 13:37:38 +0000
41+++ lib/lp/registry/browser/tests/test_product.py 2018-05-18 20:44:37 +0000
42@@ -999,7 +999,7 @@
43 tag = Tag(
44 'error', 'div', attrs={'class': 'message'},
45 text=(
46- 'The URI scheme "svn" is not allowed. '
47+ 'The URI scheme "svn" is not allowed. '
48 'Only URIs with the following schemes may be used: '
49 'git, http, https'))
50 self.assertThat(browser.contents, HTMLContains(tag))