launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3-registry-browser-doctests-future-imports-prepare into launchpad:master.

Commit message:
Prepare lp.registry.browser doctests for unicode_literals

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

These are some non-mechanical fixes needed in preparation for converting doctests under lib/lp/registry/browser/ to the usual __future__ imports.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-registry-browser-doctests-future-imports-prepare into launchpad:master.

diff --git a/lib/lp/registry/browser/tests/distroseries-views.txt b/lib/lp/registry/browser/tests/distroseries-views.txt
index bae1765..54bd8a0 100644
--- a/lib/lp/registry/browser/tests/distroseries-views.txt
+++ b/lib/lp/registry/browser/tests/distroseries-views.txt
@@ -117,7 +117,7 @@ A stable distroseries cannot be made unstable again.
     >>> form['field.status'] = 'EXPERIMENTAL'
     >>> administrate_distroseries(hoary, form)
     1 errors
-    Invalid value: token 'EXPERIMENTAL' not found in vocabulary
+    Invalid value: token ...'EXPERIMENTAL' not found in vocabulary
     Name: hoary
     Version: 5.04
     Changeslist: foo@xxxxxxx
diff --git a/lib/lp/registry/browser/tests/milestone-views.txt b/lib/lp/registry/browser/tests/milestone-views.txt
index 2613124..672a7d1 100644
--- a/lib/lp/registry/browser/tests/milestone-views.txt
+++ b/lib/lp/registry/browser/tests/milestone-views.txt
@@ -232,7 +232,7 @@ If there are files, these files will be returned as a list.
 
     >>> release_file = release.addReleaseFile(
     ...     'test.txt', b'test', 'text/plain', person,
-    ...     signature_filename='test.txt.asc', signature_content='123',
+    ...     signature_filename='test.txt.asc', signature_content=b'123',
     ...     description="test file")
     >>> view = create_view(milestone, '+index')
     >>> [file.libraryfile.filename for file in view.download_files]
diff --git a/lib/lp/registry/browser/tests/productseries-setbranch-view.txt b/lib/lp/registry/browser/tests/productseries-setbranch-view.txt
index 35cfd90..7aea39e 100644
--- a/lib/lp/registry/browser/tests/productseries-setbranch-view.txt
+++ b/lib/lp/registry/browser/tests/productseries-setbranch-view.txt
@@ -60,7 +60,7 @@ validation error.
     ...    series, name='+setbranch', principal=driver, form=form)
     >>> for error in view.errors:
     ...     print error
-    (u'Invalid value', InvalidValue("token 'foo' not found in vocabulary"))
+    (u'Invalid value', InvalidValue("token ...'foo' not found in vocabulary"))
 
 Providing a valid branch results in a successful linking.