Launchpad itself

Merge ~ilasc/launchpad:upload-error-to-text-type into launchpad:master

  1. Git
  2. lp:~ilasc/launchpad
  3. upload-error-to-text-type
  4. Merge into master
Proposed by Ioana Lasc
Status: Merged
Approved by: Ioana Lasc
Approved revision: 766a29fa6629e6d38ce2a27634a3ea1aa13c2d08
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~ilasc/launchpad:upload-error-to-text-type
Merge into: launchpad:master
Diff against target: 19 lines (+2/-2)
1 file modified
lib/lp/archiveuploader/dscfile.py (+2/-2)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+397148@code.launchpad.net

Commit message

Move from str to text_type in UploadError

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/archiveuploader/dscfile.py b/lib/lp/archiveuploader/dscfile.py
2index 3962086..9e174c4 100644
3--- a/lib/lp/archiveuploader/dscfile.py
4+++ b/lib/lp/archiveuploader/dscfile.py
5@@ -1,4 +1,4 @@
6-# Copyright 2009-2018 Canonical Ltd. This software is licensed under the
7+# Copyright 2009-2021 Canonical Ltd. This software is licensed under the
8 # GNU Affero General Public License version 3 (see the file LICENSE).
9
10 """ DSCFile and related.
11@@ -215,7 +215,7 @@ class SignableTagFile:
12 try:
13 (name, email) = parse_maintainer_bytes(addr, fieldname)
14 except ParseMaintError as error:
15- raise UploadError(str(error))
16+ raise UploadError(six.text_type(error))
17
18 person = getUtility(IPersonSet).getByEmail(email)
19 if person and person.private:

Subscribers

People subscribed via source and target branches

to status/vote changes: