Merge ~cjwatson/launchpad:py3-archiveuploader-doctests-future-imports into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 53a0c5f277cc89a4db68e245f5831f2d5991561e
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-archiveuploader-doctests-future-imports
Merge into: launchpad:master
Diff against target: 530 lines (+71/-69)
11 files modified
lib/lp/archiveuploader/tests/meta-data-custom-files.txt (+1/-1)
lib/lp/archiveuploader/tests/nascentupload-announcements.txt (+7/-5)
lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt (+5/-5)
lib/lp/archiveuploader/tests/nascentupload-ddebs.txt (+13/-13)
lib/lp/archiveuploader/tests/nascentupload-epoch-handling.txt (+2/-2)
lib/lp/archiveuploader/tests/nascentupload-packageset.txt (+4/-4)
lib/lp/archiveuploader/tests/nascentupload.txt (+22/-22)
lib/lp/archiveuploader/tests/nascentuploadfile.txt (+12/-12)
lib/lp/archiveuploader/tests/static-translations.txt (+1/-1)
lib/lp/archiveuploader/tests/test_nascentupload_documentation.py (+1/-1)
lib/lp/archiveuploader/tests/upload-path-parsing.txt (+3/-3)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+398454@code.launchpad.net

Commit message

Convert lp.archiveuploader doctests to __future__ imports

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

Self-approving: this is just more tedious print_function and unicode_literals stuff.

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/tests/meta-data-custom-files.txt b/lib/lp/archiveuploader/tests/meta-data-custom-files.txt
2index a5d2d54..cf3042d 100644
3--- a/lib/lp/archiveuploader/tests/meta-data-custom-files.txt
4+++ b/lib/lp/archiveuploader/tests/meta-data-custom-files.txt
5@@ -16,6 +16,6 @@ PackageUploadCustomFormat.META_DATA.
6 ... filepath="", checksums={}, size=1, priority_name="", policy=None,
7 ... component_and_section="main/raw-meta-data", logger=None)
8
9- >>> print custom_upload_file.custom_type.name
10+ >>> print(custom_upload_file.custom_type.name)
11 META_DATA
12
13diff --git a/lib/lp/archiveuploader/tests/nascentupload-announcements.txt b/lib/lp/archiveuploader/tests/nascentupload-announcements.txt
14index 4557415..7f9ed4a 100644
15--- a/lib/lp/archiveuploader/tests/nascentupload-announcements.txt
16+++ b/lib/lp/archiveuploader/tests/nascentupload-announcements.txt
17@@ -45,7 +45,7 @@ A helper function to examine emails that were sent:
18
19 >>> def print_addrlist(field):
20 ... for entry in sorted([addr.strip() for addr in field.split(',')]):
21- ... print entry
22+ ... print(entry)
23
24 Import the test keys to use 'insecure' policy.
25
26@@ -647,10 +647,12 @@ permitted, but RFC2047-encoded. UTF-8 in the mail content is preserved.
27 >>> len(msgs)
28 3
29
30- >>> [message['From'].replace('\n ', ' ') for message in msgs]
31- ['Root <root@localhost>', 'Root <root@localhost>',
32- '=?utf-8?q?Non-ascii_changed-by_=C4=8Ciha=C5=99?=
33- <daniel.silverstone@canonical.com>']
34+ >>> for message in msgs:
35+ ... print(message['From'].replace('\n ', ' '))
36+ Root <root@localhost>
37+ Root <root@localhost>
38+ =?utf-8?q?Non-ascii_changed-by_=C4=8Ciha=C5=99?=
39+ <daniel.silverstone@canonical.com>
40
41 UTF-8 text in the changes file that is sent on the email is preserved
42 in the MIME encoding. Please note also that the person that signed the
43diff --git a/lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt b/lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt
44index 91db6b5..8ce0f8c 100644
45--- a/lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt
46+++ b/lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt
47@@ -48,8 +48,8 @@ Check the current status of the bug we are supposed to fix:
48 Inspect the current bugtasks for bug #6:
49
50 >>> for bugtask in the_bug.bugtasks:
51- ... print bugtask.title
52- ... print bugtask.status.name
53+ ... print(bugtask.title)
54+ ... print(bugtask.status.name)
55 Bug #6 in Mozilla Firefox: "Firefox crashes when ...
56 NEW
57 Bug #6 in bar (Ubuntu): "Firefox crashes when ...
58@@ -81,7 +81,7 @@ This new version fixes bug #6 according its changesfiles:
59 >>> print(six.ensure_str(bar2_src.changes._dict['Launchpad-bugs-fixed']))
60 6
61
62- >>> print bar2_src.changes.changes_comment
63+ >>> print(bar2_src.changes.changes_comment)
64 bar (1.0-2) breezy; urgency=low
65 <BLANKLINE>
66 * A second upload to ensure that binary overrides of _all work
67@@ -103,8 +103,8 @@ FIXRELEASED and bug notification are generated:
68 >>> the_bug = getUtility(IBugSet).get(6)
69
70 >>> for bugtask in the_bug.bugtasks:
71- ... print bugtask.title
72- ... print bugtask.status.name
73+ ... print(bugtask.title)
74+ ... print(bugtask.status.name)
75 Bug #6 in Mozilla Firefox: "Firefox crashes when ...
76 NEW
77 Bug #6 in bar (Ubuntu): "Firefox crashes when ...
78diff --git a/lib/lp/archiveuploader/tests/nascentupload-ddebs.txt b/lib/lp/archiveuploader/tests/nascentupload-ddebs.txt
79index ad3ab13..980d78d 100644
80--- a/lib/lp/archiveuploader/tests/nascentupload-ddebs.txt
81+++ b/lib/lp/archiveuploader/tests/nascentupload-ddebs.txt
82@@ -33,7 +33,7 @@ it is in the queue awaiting overrides and acceptance.
83 ... 'suite/debug_1.0-1/debug_1.0-1_source.changes')
84 >>> src.process()
85 >>> result = src.do_accept()
86- >>> print src.queue_root.status.name
87+ >>> print(src.queue_root.status.name)
88 NEW
89 >>> transaction.commit()
90
91@@ -41,13 +41,13 @@ We don't really care where the source ends up, so we just accept the
92 default overrides. It is now pending publication.
93
94 >>> src.queue_root.acceptFromQueue()
95- >>> print src.queue_root.status.name
96+ >>> print(src.queue_root.status.name)
97 DONE
98
99 >>> src_pub = src.queue_root.archive.getPublishedSources(
100 ... name='debug', version='1.0-1', exact_match=True).one()
101
102- >>> print src_pub.displayname, src_pub.status.name
103+ >>> print(src_pub.displayname, src_pub.status.name)
104 debug 1.0-1 in hoary PENDING
105
106 At this point a deb and a ddeb, produced during a normal build
107@@ -61,7 +61,7 @@ Because the DEB is new, the binary upload is held in NEW.
108
109 >>> bin.process()
110 >>> result = bin.do_accept()
111- >>> print bin.queue_root.status.name
112+ >>> print(bin.queue_root.status.name)
113 NEW
114
115 This upload has one build with two binaries: a DEB and its corresponding
116@@ -70,9 +70,9 @@ DDEB.
117 >>> build = bin.queue_root.builds[0].build
118 >>> build.binarypackages.count()
119 2
120- >>> print build.binarypackages[0].binpackageformat.name
121+ >>> print(build.binarypackages[0].binpackageformat.name)
122 DEB
123- >>> print build.binarypackages[1].binpackageformat.name
124+ >>> print(build.binarypackages[1].binpackageformat.name)
125 DDEB
126 >>> build.binarypackages[0].debug_package == build.binarypackages[1]
127 True
128@@ -95,7 +95,7 @@ We override the binary to main/devel, and accept it into the archive.
129 True
130 >>> bin.queue_root.acceptFromQueue()
131
132- >>> print bin.queue_root.status.name
133+ >>> print(bin.queue_root.status.name)
134 ACCEPTED
135
136 >>> switch_dbuser(config.uploadqueue.dbuser)
137@@ -108,9 +108,9 @@ We override the binary to main/devel, and accept it into the archive.
138 Now, both, binary and debug-symbol packages are pending publication.
139
140 >>> for bin_pub in bin_pubs:
141- ... print '%s %s %s %s' % (
142+ ... print('%s %s %s %s' % (
143 ... bin_pub.displayname, bin_pub.status.name,
144- ... bin_pub.component.name, bin_pub.section.name)
145+ ... bin_pub.component.name, bin_pub.section.name))
146 debug-bin 1.0-1 in hoary i386 PENDING main devel
147 debug-bin-dbgsym 1.0-1 in hoary i386 PENDING main devel
148
149@@ -123,18 +123,18 @@ The DDEB is stored appropriately in the database.
150 >>> [deb_pub, ddeb_pub] = bin_pubs
151 >>> ddeb = ddeb_pub.binarypackagerelease
152
153- >>> print ddeb.title
154+ >>> print(ddeb.title)
155 debug-bin-dbgsym-1.0-1
156
157 The corresponding `BinaryPackageRelease` is recorded with DDEB format.
158
159- >>> print ddeb.binpackageformat.name
160+ >>> print(ddeb.binpackageformat.name)
161 DDEB
162
163 And its corresponding file is also stored as DDEB filetype.
164
165 >>> for bin_file in ddeb.files:
166- ... print bin_file.libraryfile.filename, bin_file.filetype.name
167+ ... print(bin_file.libraryfile.filename, bin_file.filetype.name)
168 debug-bin-dbgsym_1.0-1_i386.ddeb DDEB
169
170
171@@ -150,5 +150,5 @@ rejected.
172 >>> bin.process()
173 >>> bin.is_rejected
174 True
175- >>> print bin.rejection_message
176+ >>> print(bin.rejection_message)
177 Orphaned debug packages: not-debug-bin-dbgsym 1.0-1 (i386)
178diff --git a/lib/lp/archiveuploader/tests/nascentupload-epoch-handling.txt b/lib/lp/archiveuploader/tests/nascentupload-epoch-handling.txt
179index 1ba7b85..45190aa 100644
180--- a/lib/lp/archiveuploader/tests/nascentupload-epoch-handling.txt
181+++ b/lib/lp/archiveuploader/tests/nascentupload-epoch-handling.txt
182@@ -17,7 +17,7 @@ pocket.
183 >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
184 >>> hoary = ubuntu.getSeries('hoary')
185
186- >>> print hoary.status.name
187+ >>> print(hoary.status.name)
188 DEVELOPMENT
189
190
191@@ -68,7 +68,7 @@ Upload 'epoched' bar version:
192 >>> bar_src_upload = getUploadForSource(
193 ... 'suite/bar_1.0-1_epoched/bar_1.0-1_source.changes')
194 >>> bar_src_upload.process()
195- >>> print bar_src_upload.rejection_message
196+ >>> print(bar_src_upload.rejection_message)
197 File bar_1.0-1.diff.gz already exists in Primary Archive for Ubuntu
198 Linux, but uploaded version has different contents. See more
199 information about this error in
200diff --git a/lib/lp/archiveuploader/tests/nascentupload-packageset.txt b/lib/lp/archiveuploader/tests/nascentupload-packageset.txt
201index a3b7b62..6ad0c8f 100644
202--- a/lib/lp/archiveuploader/tests/nascentupload-packageset.txt
203+++ b/lib/lp/archiveuploader/tests/nascentupload-packageset.txt
204@@ -40,7 +40,7 @@ This time the upload will fail because the ACLs don't let
205 >>> bar_failed.process()
206 >>> bar_failed.is_rejected
207 True
208- >>> print bar_failed.rejection_message
209+ >>> print(bar_failed.rejection_message)
210 The signer of this package has no upload rights to this distribution's
211 primary archive. Did you mean to upload to a PPA?
212
213@@ -112,7 +112,7 @@ Let's retry the upload.
214 >>> bar_failed.process()
215 >>> bar_failed.is_rejected
216 True
217- >>> print bar_failed.rejection_message
218+ >>> print(bar_failed.rejection_message)
219 The signer of this package is lacking the upload rights for the source
220 package, component or package set in question.
221
222@@ -135,7 +135,7 @@ Add 'bar' to the 'foo' package set.
223 Now 'bar' is included by the 'foo' package set.
224
225 >>> [ps] = ps_set.setsIncludingSource('bar', direct_inclusion=True)
226- >>> print ps.name
227+ >>> print(ps.name)
228 foo-pkg-set
229
230 name16 has no package set based upload privileges for 'bar' yet.
231@@ -169,5 +169,5 @@ With the authorization above the upload should work again.
232 >>> bar2.is_rejected
233 False
234
235- >>> print bar2.rejection_message
236+ >>> print(bar2.rejection_message)
237
238diff --git a/lib/lp/archiveuploader/tests/nascentupload.txt b/lib/lp/archiveuploader/tests/nascentupload.txt
239index 37f6836..20fb5f1 100644
240--- a/lib/lp/archiveuploader/tests/nascentupload.txt
241+++ b/lib/lp/archiveuploader/tests/nascentupload.txt
242@@ -60,7 +60,7 @@ on that.
243 lp.archiveuploader.nascentupload.EarlyReturnUploadError: An error occurred that prevented further processing.
244 >>> nonexistent.is_rejected
245 True
246- >>> print nonexistent.rejection_message
247+ >>> print(nonexistent.rejection_message)
248 Unable to read DOES-NOT-EXIST: ...
249
250 >>> quodlibet = NascentUpload.from_changesfile_path(
251@@ -68,7 +68,7 @@ on that.
252 ... anything_policy, DevNullLogger())
253 >>> quodlibet.process()
254 >>> for f in quodlibet.changes.files:
255- ... print f.filename, f
256+ ... print(f.filename, f)
257 quodlibet_0.13.1-1_all.deb <...DebBinaryUploadFile...>
258 quodlibet-ext_0.13.1-1_i386.deb <...DebBinaryUploadFile...>
259
260@@ -119,7 +119,7 @@ is 'native' (only a TARBALL, no diff + orig) or 'has_orig' (uses ORIG
261
262 >>> ed_source_upload.process()
263 >>> for f in ed_source_upload.changes.files:
264- ... print f.filename, f
265+ ... print(f.filename, f)
266 ed_0.2-20.dsc <...DSCFile...>
267 ed_0.2-20.diff.gz <...SourceUploadFile...>
268 ed_0.2.orig.tar.gz <...SourceUploadFile...>
269@@ -129,7 +129,7 @@ try and parse the maintainer for it:
270
271 >>> ed_source_upload.changes.signer is None
272 True
273- >>> print ed_source_upload.changes.maintainer
274+ >>> print(ed_source_upload.changes.maintainer)
275 None
276
277 ed_source upload is *sourceful*:
278@@ -177,7 +177,7 @@ Let's try a simple binary upload:
279
280 >>> ed_binary_upload.process()
281 >>> for f in ed_binary_upload.changes.files:
282- ... print f.filename, f
283+ ... print(f.filename, f)
284 ed_0.2-20_i386.deb <...DebBinaryUploadFile...>
285
286 ed_binary is *binaryful*:
287@@ -209,7 +209,7 @@ parse the maintainer for them either:
288
289 >>> ed_binary_upload.changes.signer is None
290 True
291- >>> print ed_binary_upload.changes.maintainer
292+ >>> print(ed_binary_upload.changes.maintainer)
293 None
294
295 Other ChangesFile information are also checked across the uploads
296@@ -228,7 +228,7 @@ should match the files target architectures:
297 >>> ed_mismatched_upload.process()
298
299 >>> for f in ed_mismatched_upload.changes.files:
300- ... print f.filename, f
301+ ... print(f.filename, f)
302 ed_0.2-20_i386.deb <...DebBinaryUploadFile...>
303
304 >>> for a in ed_mismatched_upload.changes.architectures:
305@@ -238,7 +238,7 @@ should match the files target architectures:
306 Since the changesfile specify that only 'amd64' will be used and
307 there is a file that depends on 'i386' the upload is rejected:
308
309- >>> print ed_mismatched_upload.rejection_message
310+ >>> print(ed_mismatched_upload.rejection_message)
311 ed_0.2-20_i386.deb: control file lists arch as 'i386' which isn't in the
312 changes file.
313
314@@ -331,7 +331,7 @@ Retrive the just-inserted SourcePackageRelease correspondent to 'ed'
315 Check if we have rebuid the change's author line properly (as
316 mentioned in bug # 30621)
317
318- >>> print ed_spr.changelog_entry #doctest: -NORMALIZE_WHITESPACE
319+ >>> print(ed_spr.changelog_entry) #doctest: -NORMALIZE_WHITESPACE
320 ed (0.2-20) unstable; urgency=low
321 <BLANKLINE>
322 * Move to dpatch; existing non-debian/ changes split into
323@@ -383,7 +383,7 @@ The content of 'debian/copyright' is stored as the 'copyright'
324 attribute of SourcePackageRelease (note that its content is filtered
325 with encoding.guess()).
326
327- >>> print ed_spr.copyright
328+ >>> print(ed_spr.copyright)
329 This is Debian GNU's prepackaged version of the FSF's GNU ed
330 ...
331 by the Foundation.
332@@ -420,7 +420,7 @@ On the absence of debian/copyright a warning is issued in the upload
333 processing log messages, then it can be further checked in Soyuz
334 production mailbox.
335
336- >>> print nocopyright_src.warning_message
337+ >>> print(nocopyright_src.warning_message)
338 <BLANKLINE>
339 Upload Warnings:
340 No copyright file found.
341@@ -484,7 +484,7 @@ The upload will be rejected.
342 >>> ed_src_dup.is_rejected
343 True
344
345- >>> print ed_src_dup.rejection_message
346+ >>> print(ed_src_dup.rejection_message)
347 The source ed - 0.2-20 is already accepted in ubuntu/hoary and you
348 cannot upload the same version within the same distribution. You
349 have to modify the source version and re-upload.
350@@ -652,14 +652,14 @@ overridden by the changesfile:
351
352 >>> success = ed_src.do_accept()
353
354- >>> print ed_src.queue_root.pocket.name
355+ >>> print(ed_src.queue_root.pocket.name)
356 UPDATES
357
358 Even though this went to a pocket and thus would be unapproved rather
359 than accepted, the ed upload ought still make it to NEW instead of
360 unapproved.
361
362- >>> print ed_src.queue_root.status.name
363+ >>> print(ed_src.queue_root.status.name)
364 NEW
365
366 And pop it back to development now that we're done
367@@ -676,7 +676,7 @@ Check the uploader behaviour against a missing orig.tar.gz file,
368 >>> ed21_src.process()
369 >>> ed21_src.is_rejected
370 True
371- >>> print ed21_src.rejection_message+"\nEND"
372+ >>> print(ed21_src.rejection_message+"\nEND")
373 Unable to find ed_0.2.orig.tar.gz in upload or distribution.
374 Files specified in DSC are broken or missing, skipping package unpack
375 verification.
376@@ -762,15 +762,15 @@ record is a placeholder one, we used the second key):
377
378 >>> name16 = getUtility(IPersonSet).getByName('name16')
379 >>> uploader_key = name16.gpg_keys[1]
380- >>> print uploader_key.fingerprint
381+ >>> print(uploader_key.fingerprint)
382 340CA3BB270E2716C9EE0B768E7EB7086C64A8C5
383
384 Both, DSC and changesfile are signed with Name16's second key.
385
386- >>> print bar_ok.changes.dsc.signingkey.fingerprint
387+ >>> print(bar_ok.changes.dsc.signingkey.fingerprint)
388 340CA3BB270E2716C9EE0B768E7EB7086C64A8C5
389
390- >>> print bar_ok.changes.signingkey.fingerprint
391+ >>> print(bar_ok.changes.signingkey.fingerprint)
392 340CA3BB270E2716C9EE0B768E7EB7086C64A8C5
393
394 Let's modify the current ACL rules for ubuntu, moving the upload
395@@ -795,7 +795,7 @@ This time the upload will fail because the ACLs don't let
396 >>> bar_failed.process()
397 >>> bar_failed.is_rejected
398 True
399- >>> print bar_failed.rejection_message
400+ >>> print(bar_failed.rejection_message)
401 The signer of this package has no upload rights to this distribution's
402 primary archive. Did you mean to upload to a PPA?
403
404@@ -808,10 +808,10 @@ for further checks:
405 >>> verifyObject(IGPGKey, bar_failed.changes.signingkey)
406 True
407
408- >>> print bar_failed.changes.dsc.signingkey.fingerprint
409+ >>> print(bar_failed.changes.dsc.signingkey.fingerprint)
410 340CA3BB270E2716C9EE0B768E7EB7086C64A8C5
411
412- >>> print bar_failed.changes.signingkey.fingerprint
413+ >>> print(bar_failed.changes.signingkey.fingerprint)
414 340CA3BB270E2716C9EE0B768E7EB7086C64A8C5
415
416 The ACL rules also enable us to specify that a user has a
417@@ -840,7 +840,7 @@ Now try the "bar" upload:
418 >>> bar2.is_rejected
419 False
420
421- >>> print bar2.rejection_message
422+ >>> print(bar2.rejection_message)
423
424
425 Uploads to copy archives
426diff --git a/lib/lp/archiveuploader/tests/nascentuploadfile.txt b/lib/lp/archiveuploader/tests/nascentuploadfile.txt
427index 85a2ac7..7af20da 100644
428--- a/lib/lp/archiveuploader/tests/nascentuploadfile.txt
429+++ b/lib/lp/archiveuploader/tests/nascentuploadfile.txt
430@@ -126,7 +126,7 @@ we can deal with the errors later:
431 At this point we can inspect the list of files contained in the upload.
432
433 >>> for uploaded_file in ed_binary_changes.files:
434- ... print uploaded_file.filename
435+ ... print(uploaded_file.filename)
436 ed_0.2-20_i386.deb
437
438 >>> for f in ed_binary_changes.binary_package_files:
439@@ -181,14 +181,14 @@ regexp, even though it isn't actually a source file:
440
441 >>> from lp.archiveuploader.utils import re_issource
442 >>> src_match = re_issource.match('dist-upgrader_1.0.tar.gz')
443- >>> src_match.group(0)
444- 'dist-upgrader_1.0.tar.gz'
445- >>> src_match.group(1)
446- 'dist-upgrader'
447- >>> src_match.group(2)
448- '1.0'
449- >>> src_match.group(3)
450- 'tar.gz'
451+ >>> print(src_match.group(0))
452+ dist-upgrader_1.0.tar.gz
453+ >>> print(src_match.group(1))
454+ dist-upgrader
455+ >>> print(src_match.group(2))
456+ 1.0
457+ >>> print(src_match.group(3))
458+ tar.gz
459
460 That's why we recognize them by identifying a set of custom sections:
461
462@@ -444,7 +444,7 @@ Sub-DSCFiles are DSCUploadedFile objects.
463 We can also inspect the list of files declared in this DSC:
464
465 >>> for dsc_file in ed_source_dsc.files:
466- ... print dsc_file.filename
467+ ... print(dsc_file.filename)
468 ed_0.2.orig.tar.gz
469 ed_0.2-20.diff.gz
470
471@@ -514,7 +514,7 @@ being too new:
472 ... 'main/editors', 'important', 'foo', '1.2', ed_binary_changes,
473 ... old_only_policy, DevNullLogger())
474 >>> list(ed_binary_deb.verifyDebTimestamp())
475- [UploadError('ed_0.2-20_i386.deb:
476+ [UploadError(...'ed_0.2-20_i386.deb:
477 has 26 file(s) with a time stamp too far into the future
478 (e.g. control [Thu Jan 3 19:29:01 2008]).',)]
479
480@@ -529,6 +529,6 @@ being too new:
481 ... 'main/editors', 'important', 'foo', '1.2', ed_binary_changes,
482 ... new_only_policy, DevNullLogger())
483 >>> list(ed_binary_deb.verify())
484- [UploadError('ed_0.2-20_i386.deb:
485+ [UploadError(...'ed_0.2-20_i386.deb:
486 has 26 file(s) with a time stamp too far in the past
487 (e.g. control [Thu Jan 3 19:29:01 2008]).',)]
488diff --git a/lib/lp/archiveuploader/tests/static-translations.txt b/lib/lp/archiveuploader/tests/static-translations.txt
489index a6e9ef2..52b7a25 100644
490--- a/lib/lp/archiveuploader/tests/static-translations.txt
491+++ b/lib/lp/archiveuploader/tests/static-translations.txt
492@@ -14,7 +14,7 @@ PackageUploadCustomFormat.STATIC_TRANSLATIONS.
493 ... filepath="", checksums={}, size=1, priority_name="", policy=None,
494 ... component_and_section="main/raw-translations-static", logger=None)
495
496- >>> print custom_upload_file.custom_type.name
497+ >>> print(custom_upload_file.custom_type.name)
498 STATIC_TRANSLATIONS
499
500 Static translations tarballs are not published, they only exist in the
501diff --git a/lib/lp/archiveuploader/tests/test_nascentupload_documentation.py b/lib/lp/archiveuploader/tests/test_nascentupload_documentation.py
502index 646d7b4..bc18b56 100644
503--- a/lib/lp/archiveuploader/tests/test_nascentupload_documentation.py
504+++ b/lib/lp/archiveuploader/tests/test_nascentupload_documentation.py
505@@ -65,7 +65,7 @@ def testGlobalsSetup(test):
506 We can use the getUpload* without unnecessary imports.
507 """
508 import_public_test_keys()
509- setGlobs(test)
510+ setGlobs(test, future=True)
511 test.globs['getUploadForSource'] = getUploadForSource
512 test.globs['getUploadForBinary'] = getUploadForBinary
513 test.globs['getPPAUploadForSource'] = getPPAUploadForSource
514diff --git a/lib/lp/archiveuploader/tests/upload-path-parsing.txt b/lib/lp/archiveuploader/tests/upload-path-parsing.txt
515index 17e8ba9..ea7666e 100644
516--- a/lib/lp/archiveuploader/tests/upload-path-parsing.txt
517+++ b/lib/lp/archiveuploader/tests/upload-path-parsing.txt
518@@ -14,9 +14,9 @@ in several scenarios.
519 >>> def check_upload(relative_path):
520 ... (distribution, suite_name, archive) = parse_upload_path(
521 ... relative_path)
522- ... print 'Archive: %s' % archive.name
523- ... print 'Distribution: %s' % distribution.name
524- ... print 'Suite: %s' % suite_name
525+ ... print('Archive: %s' % archive.name)
526+ ... print('Distribution: %s' % distribution.name)
527+ ... print('Suite: %s' % suite_name)
528
529
530 == Distribution uploads ==

Subscribers

People subscribed via source and target branches

to status/vote changes: