← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~lgp171188/launchpad:focal-fixes into launchpad:master

 

Guruprasad has proposed merging ~lgp171188/launchpad:focal-fixes into launchpad:master.

Commit message:
Handle BaseException.__repr__ changes in Python 3.7

Python 3.7 removed the trailing comma from the `repr` of single-argument
exceptions.  Adjust a few doctests to tolerate this.


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/429616
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:focal-fixes into launchpad:master.
diff --git a/lib/lp/archiveuploader/tests/nascentuploadfile.rst b/lib/lp/archiveuploader/tests/nascentuploadfile.rst
index 24b3011..8c75f65 100644
--- a/lib/lp/archiveuploader/tests/nascentuploadfile.rst
+++ b/lib/lp/archiveuploader/tests/nascentuploadfile.rst
@@ -487,7 +487,7 @@ changes file:
     >>> list(ed_binary_deb.verify())
     [UploadError(...'ed_0.2-20_i386.deb
     control file lists section as main/editors but changes file has
-    main/net.',)]
+    main/net.'...)]
 
 It also checks the priority against the changes file:
 
@@ -497,7 +497,7 @@ It also checks the priority against the changes file:
     ...     modified_insecure_policy, DevNullLogger())
     >>> list(ed_binary_deb.verify())
     [UploadError(...'ed_0.2-20_i386.deb
-    control file lists priority as important but changes file has extra.',)]
+    control file lists priority as important but changes file has extra.'...)]
 
 The timestamp of the files in the .deb are tested against the policy for
 being too new:
@@ -515,7 +515,7 @@ being too new:
     >>> list(ed_binary_deb.verifyDebTimestamp())
     [UploadError(...'ed_0.2-20_i386.deb:
     has 26 file(s) with a time stamp too far into the future
-    (e.g. ./ [Thu Jan  3 19:29:00 2008]).',)]
+    (e.g. ./ [Thu Jan  3 19:29:00 2008]).'...)]
 
 ... as well as for being too old:
 
@@ -530,4 +530,4 @@ being too new:
     >>> list(ed_binary_deb.verify())
     [UploadError(...'ed_0.2-20_i386.deb:
     has 26 file(s) with a time stamp too far in the past
-    (e.g. ./ [Thu Jan  3 19:29:00 2008]).',)]
+    (e.g. ./ [Thu Jan  3 19:29:00 2008]).'...)]

Follow ups