launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3-doctest-LookupError into launchpad:master.

Commit message:
Adjust doctests for different rendering of LookupErrors in Python 3

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/396862
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-doctest-LookupError into launchpad:master.

diff --git a/lib/lp/answers/stories/question-search-multiple-languages.txt b/lib/lp/answers/stories/question-search-multiple-languages.txt
index 034c130..e83655f 100644
--- a/lib/lp/answers/stories/question-search-multiple-languages.txt
+++ b/lib/lp/answers/stories/question-search-multiple-languages.txt
@@ -106,7 +106,7 @@ language controls.
     >>> anon_browser.getControl(name='field.language')
     Traceback (most recent call last):
       ...
-    LookupError: name u'field.language...
+    LookupError: name ...'field.language...
 
     >>> content = find_main_content(anon_browser.contents).find('p')
     >>> print(content.decode_contents())
@@ -124,7 +124,7 @@ mapped, we assume they speak the default language of English.
     >>> anon_browser.getControl(name='field.language')
     Traceback (most recent call last):
       ...
-    LookupError: name u'field.language...
+    LookupError: name ...'field.language...
 
 But if the user configures their browser to accept Spanish and English
 then questions with those language will be displayed:
@@ -177,7 +177,7 @@ that language, we do not show the language controls.
     >>> user_browser.getControl(name='field.language')
     Traceback (most recent call last):
       ...
-    LookupError: name u'field.language...
+    LookupError: name ...'field.language...
 
 When No Privileges Person adds Spanish and English to their browser, they
 are added to the language controls.
diff --git a/lib/lp/bugs/stories/bug-also-affects/xx-bug-also-affects.txt b/lib/lp/bugs/stories/bug-also-affects/xx-bug-also-affects.txt
index 797e5ad..7867390 100644
--- a/lib/lp/bugs/stories/bug-also-affects/xx-bug-also-affects.txt
+++ b/lib/lp/bugs/stories/bug-also-affects/xx-bug-also-affects.txt
@@ -257,7 +257,7 @@ package is linked to the evolution upstream product.
     >>> user_browser.getControl('Project').value
     Traceback (most recent call last):
     ...
-    LookupError: label u'Project'
+    LookupError: label ...'Project'
     ...
 
     >>> user_browser.getControl(name='field.product').value
diff --git a/lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt b/lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt
index 48ef775..fde1d46 100644
--- a/lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt
+++ b/lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt
@@ -171,7 +171,7 @@ This specialized list does not include the search form. So there is no
     >>> user_browser.getControl('Search', index=0).type
     Traceback (most recent call last):
     ...
-    LookupError: label u'Search'
+    LookupError: label ...'Search'
     ...
 
 The 'Report a bug' link is also not present.
diff --git a/lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt b/lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt
index 2e3990f..6aef343 100644
--- a/lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt
+++ b/lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt
@@ -123,7 +123,7 @@ any team and hence does no see the option to asign somebody else.
     >>> user_browser.getControl(name="jokosher.assignee", index=0)
     Traceback (most recent call last):
     ...
-    LookupError: name u'jokosher.assignee'
+    LookupError: name ...'jokosher.assignee'
     ...
 
 Once no_priv is a member of a team, the option is shown.
diff --git a/lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt b/lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt
index a3d38d8..443f5d2 100644
--- a/lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt
+++ b/lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt
@@ -425,7 +425,7 @@ The first and second restrictions both apply to the GNOME Bugzilla:
     >>> user_browser.getControl('Delete')
     Traceback (most recent call last):
     ...
-    LookupError: label u'Delete'
+    LookupError: label ...'Delete'
     ...
 
 Note how we tell the user about _all_ the restrictions they face. In
@@ -450,7 +450,7 @@ Tracker:
     >>> user_browser.getControl('Delete')
     Traceback (most recent call last):
     ...
-    LookupError: label u'Delete'
+    LookupError: label ...'Delete'
     ...
 
 Again, we tell the user about all the restrictions they have stumbled
@@ -468,7 +468,7 @@ deleting bug watches en masse:
     >>> admin_browser.getControl('Delete')
     Traceback (most recent call last):
     ...
-    LookupError: label u'Delete'
+    LookupError: label ...'Delete'
     ...
 
 
@@ -485,7 +485,7 @@ Ordinary users can't disable a bug tracker.
     >>> user_browser.getControl(name='field.active')
     Traceback (most recent call last):
       ...
-    LookupError: name u'field.active'
+    LookupError: name ...'field.active'
     ...
 
 But admins can.
diff --git a/lib/lp/bugs/stories/bugtracker/xx-reschedule-all-watches.txt b/lib/lp/bugs/stories/bugtracker/xx-reschedule-all-watches.txt
index f93b229..e392a7f 100644
--- a/lib/lp/bugs/stories/bugtracker/xx-reschedule-all-watches.txt
+++ b/lib/lp/bugs/stories/bugtracker/xx-reschedule-all-watches.txt
@@ -25,7 +25,7 @@ page. It isn't visible to ordinary users, however.
     >>> user_browser.getControl('Reschedule all watches')
     Traceback (most recent call last):
       ...
-    LookupError: label u'Reschedule all watches'
+    LookupError: label ...'Reschedule all watches'
     ...
 
 However, the reschedule button will appear to administrators.
@@ -80,5 +80,5 @@ appear on the bugtracker page.
     ...     'Reschedule all watches')
     Traceback (most recent call last):
       ...
-    LookupError: label u'Reschedule all watches'
+    LookupError: label ...'Reschedule all watches'
     ...
diff --git a/lib/lp/bugs/stories/bugwatches/xx-bugtask-bugwatch-linkage.txt b/lib/lp/bugs/stories/bugwatches/xx-bugtask-bugwatch-linkage.txt
index 2d8bfde..f9193ac 100644
--- a/lib/lp/bugs/stories/bugwatches/xx-bugtask-bugwatch-linkage.txt
+++ b/lib/lp/bugs/stories/bugwatches/xx-bugtask-bugwatch-linkage.txt
@@ -29,7 +29,7 @@ This means that we only display the status, it's not possible to edit it:
     >>> status_control = browser.getControl(name='debian_mozilla-firefox.status')
     Traceback (most recent call last):
     ...
-    LookupError: name u'debian_mozilla-firefox.status'
+    LookupError: name ...'debian_mozilla-firefox.status'
     ...
 
 Of course we can't edit the importance or assignee either.
@@ -37,13 +37,13 @@ Of course we can't edit the importance or assignee either.
     >>> browser.getControl(name='debian_mozilla-firefox.importance')
     Traceback (most recent call last):
     ...
-    LookupError: name u'debian_mozilla-firefox.importance'
+    LookupError: name ...'debian_mozilla-firefox.importance'
     ...
 
     >>> browser.getControl(name='debian_mozilla-firefox.assignee')
     Traceback (most recent call last):
     ...
-    LookupError: name u'debian_mozilla-firefox.assignee'
+    LookupError: name ...'debian_mozilla-firefox.assignee'
     ...
 
 If we remove the bug watch, we'll be able to edit the status, which has
diff --git a/lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt b/lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt
index 9518d01..9cd635b 100644
--- a/lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt
+++ b/lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt
@@ -169,7 +169,7 @@ For a new watch, the "Update Now" button isn't shown.
     >>> user_browser.getControl('Update Now')
     Traceback (most recent call last):
       ...
-    LookupError: label u'Update Now'
+    LookupError: label ...'Update Now'
     ...
 
 If the watch has been checked but has never failed, the button will
@@ -183,7 +183,7 @@ remain hidden.
     >>> user_browser.getControl('Update Now')
     Traceback (most recent call last):
       ...
-    LookupError: label u'Update Now'
+    LookupError: label ...'Update Now'
     ...
 
 If the watch has failed less than 60% of its recent checks, the button
@@ -225,7 +225,7 @@ The button will no longer be shown on the page.
     >>> reschedule_button = user_browser.getControl('Update Now')
     Traceback (most recent call last):
       ...
-    LookupError: label u'Update Now'
+    LookupError: label ...'Update Now'
     ...
 
 If a watch has run once and failed once, the reschedule button will be
@@ -266,7 +266,7 @@ watch for checking.
     >>> user_browser.getControl('Update Now')
     Traceback (most recent call last):
       ...
-    LookupError: label u'Update Now'
+    LookupError: label ...'Update Now'
     ...
 
 
@@ -323,5 +323,5 @@ button will not appear.
     >>> user_browser.getControl('Reset this watch')
     Traceback (most recent call last):
       ...
-    LookupError: label u'Reset this watch'
+    LookupError: label ...'Reset this watch'
     ...
diff --git a/lib/lp/bugs/stories/guided-filebug/xx-options-for-bug-supervisors.txt b/lib/lp/bugs/stories/guided-filebug/xx-options-for-bug-supervisors.txt
index d3ec219..f5d8da2 100644
--- a/lib/lp/bugs/stories/guided-filebug/xx-options-for-bug-supervisors.txt
+++ b/lib/lp/bugs/stories/guided-filebug/xx-options-for-bug-supervisors.txt
@@ -13,25 +13,25 @@ Users who are not bug supervisors do not see any of these options:
     >>> user_browser.getControl('Status')
     Traceback (most recent call last):
     ...
-    LookupError: label u'Status'
+    LookupError: label ...'Status'
     ...
 
     >>> user_browser.getControl('Importance')
     Traceback (most recent call last):
     ...
-    LookupError: label u'Importance'
+    LookupError: label ...'Importance'
     ...
 
     >>> user_browser.getControl('Milestone')
     Traceback (most recent call last):
     ...
-    LookupError: label u'Milestone'
+    LookupError: label ...'Milestone'
     ...
 
     >>> user_browser.getControl('Assign to')
     Traceback (most recent call last):
     ...
-    LookupError: label u'Assign to'
+    LookupError: label ...'Assign to'
     ...
 
 Users who are bug supervisors can see these options:
diff --git a/lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt b/lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt
index de639aa..eb3cd01 100644
--- a/lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt
+++ b/lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt
@@ -145,7 +145,7 @@ the page.
     >>> remove_other = browser.getControl('\xa0No Privileges Person')
     Traceback (most recent call last):
     ...
-    LookupError: label u'\xa0No Privileges Person'
+    LookupError: label ...'\xa0No Privileges Person'
     ...
 
 We clean up by removing Sample Person as the distribution driver.
@@ -188,13 +188,13 @@ the UI elements for the subscription/unsubscription of arbitrary persons.
     >>> browser.getControl('Subscribe someone else:')
     Traceback (most recent call last):
     ...
-    LookupError: label u'Subscribe someone else:'
+    LookupError: label ...'Subscribe someone else:'
     ...
 
     >>> print(browser.getControl('\xa0Foo Bar'))
     Traceback (most recent call last):
     ...
-    LookupError: label u'\xa0Foo Bar'
+    LookupError: label ...'\xa0Foo Bar'
     ...
 
 
diff --git a/lib/lp/code/stories/branches/xx-branch-edit.txt b/lib/lp/code/stories/branches/xx-branch-edit.txt
index f501da0..a69fc06 100644
--- a/lib/lp/code/stories/branches/xx-branch-edit.txt
+++ b/lib/lp/code/stories/branches/xx-branch-edit.txt
@@ -217,7 +217,7 @@ Check that when editing a hosted branch the URL field is not shown.
     ...     'http://acme.example.com/~foo/bar/baz')
     Traceback (most recent call last):
     ...
-    LookupError: label u'Branch URL'
+    LookupError: label ...'Branch URL'
     ...
 
 
diff --git a/lib/lp/code/stories/branches/xx-branch-listings.txt b/lib/lp/code/stories/branches/xx-branch-listings.txt
index 9790507..f0808a2 100644
--- a/lib/lp/code/stories/branches/xx-branch-listings.txt
+++ b/lib/lp/code/stories/branches/xx-branch-listings.txt
@@ -330,7 +330,7 @@ The implicitly sorted listings do not have an ordering widget at all.
     >>> browser.getControl(name='field.sort_by').value
     Traceback (most recent call last):
     ...
-    LookupError: name u'field.sort_by'
+    LookupError: name ...'field.sort_by'
     ...
 
 Finally, sorting by a particular criterion has the desired effect.
diff --git a/lib/lp/code/stories/codeimport/xx-admin-codeimport.txt b/lib/lp/code/stories/codeimport/xx-admin-codeimport.txt
index 7c9fbf4..d0d49ab 100644
--- a/lib/lp/code/stories/codeimport/xx-admin-codeimport.txt
+++ b/lib/lp/code/stories/codeimport/xx-admin-codeimport.txt
@@ -333,7 +333,7 @@ Anonymous users cannot see this button.
     >>> anon_browser.getControl('Import Now')
     Traceback (most recent call last):
       ...
-    LookupError: label u'Import Now'
+    LookupError: label ...'Import Now'
     ...
 
 If the logged in user clicks this button, the import will be scheduled
diff --git a/lib/lp/code/stories/codeimport/xx-edit-codeimport.txt b/lib/lp/code/stories/codeimport/xx-edit-codeimport.txt
index c7aebb5..d7a6f77 100644
--- a/lib/lp/code/stories/codeimport/xx-edit-codeimport.txt
+++ b/lib/lp/code/stories/codeimport/xx-edit-codeimport.txt
@@ -128,7 +128,7 @@ Anonymous users cannot see this button.
     >>> anon_browser.getControl('Import Now')
     Traceback (most recent call last):
       ...
-    LookupError: label u'Import Now'
+    LookupError: label ...'Import Now'
     ...
 
 If the logged in user clicks this button, the import will be scheduled
diff --git a/lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt b/lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt
index c774c59..0ab3eb3 100644
--- a/lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt
+++ b/lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt
@@ -269,7 +269,7 @@ Similarly to users, teams with active PPAs cannot be renamed either.
     >>> sample_browser.getControl(name='field.name').value = 'duderinos'
     Traceback (most recent call last):
     ...
-    LookupError: name u'field.name'
+    LookupError: name ...'field.name'
     ...
 
     >>> print(extract_text(
@@ -557,7 +557,7 @@ all their PPAs.
     >>> cprov_browser.getControl(name="field.accepted")
     Traceback (most recent call last):
     ...
-    LookupError: name u'field.accepted'
+    LookupError: name ...'field.accepted'
     ...
 
     >>> print(extract_text(
diff --git a/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt b/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
index 6b1a2a2..568e3c8 100644
--- a/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
+++ b/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
@@ -105,7 +105,7 @@ The 'search' form is also suppresed.
     >>> anon_browser.getControl('Search', index=0).click()
     Traceback (most recent call last):
     ...
-    LookupError: label u'Search'
+    LookupError: label ...'Search'
     ...
 
 
diff --git a/lib/lp/translations/stories/standalone/xx-pofile-translate-needs-review-flags-preserved.txt b/lib/lp/translations/stories/standalone/xx-pofile-translate-needs-review-flags-preserved.txt
index 17152d7..3f79034 100644
--- a/lib/lp/translations/stories/standalone/xx-pofile-translate-needs-review-flags-preserved.txt
+++ b/lib/lp/translations/stories/standalone/xx-pofile-translate-needs-review-flags-preserved.txt
@@ -18,7 +18,7 @@ So, the checkbox is not shown.
     ...     'Someone should review this translation')
     Traceback (most recent call last):
     ...
-    LookupError: label u'Someone...
+    LookupError: label ...'Someone...
 
 If the same user tries translating for another, unrestricted project,
 they get to see the checkbox: