launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-py3-NotFound-native-string into launchpad:master.

Commit message:
Adjust a few more tests to handle recent NotFound change

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/397658

These were broken by 0382e6389a96685665890abca803465e02cefe56 (https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/397620).
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-py3-NotFound-native-string into launchpad:master.

diff --git a/lib/lp/bugs/stories/webservice/xx-bug.txt b/lib/lp/bugs/stories/webservice/xx-bug.txt
index 1828357..6191014 100644
--- a/lib/lp/bugs/stories/webservice/xx-bug.txt
+++ b/lib/lp/bugs/stories/webservice/xx-bug.txt
@@ -1207,7 +1207,7 @@ a 404 error, but do not generate an OOPS.
     Content-Length: ...
     ...
     <BLANKLINE>
-    Object: <...BugTrackerSet object at ...>, name: u'mozilla.org'
+    Object: <...BugTrackerSet object at ...>, name: 'mozilla.org'
 
 Naturally, if we follow the Location: header then we'll get the
 renamed bug tracker.
diff --git a/lib/lp/code/stories/branches/xx-branch-reference.txt b/lib/lp/code/stories/branches/xx-branch-reference.txt
index b419da3..3748402 100644
--- a/lib/lp/code/stories/branches/xx-branch-reference.txt
+++ b/lib/lp/code/stories/branches/xx-branch-reference.txt
@@ -59,7 +59,7 @@ a 404 error:
   ... # doctest: +IGNORE_EXCEPTION_MODULE_IN_PYTHON2
   Traceback (most recent call last):
     ...
-  zope.publisher.interfaces.NotFound: ... u'.bzr'
+  zope.publisher.interfaces.NotFound: ... '.bzr'
 
 
 Product Branch
@@ -83,4 +83,4 @@ associated with it, we get a 404 error:
   ... # doctest: +IGNORE_EXCEPTION_MODULE_IN_PYTHON2
   Traceback (most recent call last):
     ...
-  zope.publisher.interfaces.NotFound: ... u'.bzr'
+  zope.publisher.interfaces.NotFound: ... '.bzr'
diff --git a/lib/lp/services/worlddata/stories/webservice/xx-country.txt b/lib/lp/services/worlddata/stories/webservice/xx-country.txt
index 30aeaa7..d72f8a6 100644
--- a/lib/lp/services/worlddata/stories/webservice/xx-country.txt
+++ b/lib/lp/services/worlddata/stories/webservice/xx-country.txt
@@ -31,7 +31,7 @@ Make sure that invalid countries return 404s and not OOPSes.
     >>> print(webservice.get(bogus_country))
     HTTP/1.1 404 Not Found
     ...
-    Object: ..., name: u'bogus'
+    Object: ..., name: 'bogus'
 
 == Country Custom Operations ==
 
diff --git a/lib/lp/soyuz/stories/ppa/xx-ppa-files.txt b/lib/lp/soyuz/stories/ppa/xx-ppa-files.txt
index 9edf75e..ebe6c7b 100644
--- a/lib/lp/soyuz/stories/ppa/xx-ppa-files.txt
+++ b/lib/lp/soyuz/stories/ppa/xx-ppa-files.txt
@@ -429,6 +429,6 @@ the error occurred based on the traceback included in the page.
     Lost something?
     ...
     NotFound:
-    Object: &lt;Archive at ...&gt;, name: u'test-pkg'...
+    Object: &lt;Archive at ...&gt;, name: 'test-pkg'...
     ...
 
diff --git a/lib/lp/soyuz/stories/webservice/xx-archive.txt b/lib/lp/soyuz/stories/webservice/xx-archive.txt
index 8e2ddc6..d613d25 100644
--- a/lib/lp/soyuz/stories/webservice/xx-archive.txt
+++ b/lib/lp/soyuz/stories/webservice/xx-archive.txt
@@ -156,7 +156,7 @@ Attempting to grab a non-existent archive will result in a 404 error:
     >>> print(webservice.get(bogus_archive))
     HTTP/1.1 404 Not Found
     ...
-    Object: ..., name: u'bogus'
+    Object: ..., name: 'bogus'
 
 
 Archive Permissions