Merge ~cjwatson/launchpad:py3-buildmaster-doctest-unicode-strings into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: eea98450a2ad8a6573d50abfd8eeba421fc7c594
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-buildmaster-doctest-unicode-strings
Merge into: launchpad:master
Diff against target: 52 lines (+9/-8)
2 files modified
lib/lp/buildmaster/doc/builder.txt (+5/-4)
lib/lp/buildmaster/doc/buildqueue.txt (+4/-4)
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+396733@code.launchpad.net

Commit message

lp.buildmaster: Fix u'...' doctest examples for Python 3

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/buildmaster/doc/builder.txt b/lib/lp/buildmaster/doc/builder.txt
2index e8249ad..7fe82f7 100644
3--- a/lib/lp/buildmaster/doc/builder.txt
4+++ b/lib/lp/buildmaster/doc/builder.txt
5@@ -74,8 +74,8 @@ The 'new' method will create a new builder in the database.
6 >>> with admin_logged_in():
7 ... bnew = builderset.new(
8 ... [1], 'http://dummy.com:8221/', 'dummy', 'Dummy Title', 1)
9- >>> bnew.name
10- u'dummy'
11+ >>> print(bnew.name)
12+ dummy
13
14 'getBuilders' returns builders with the 'active' flag set, ordered by
15 virtualization status, architecture, then name.
16@@ -102,8 +102,9 @@ Processor/virtualization.
17
18 There are no 'amd64' build queue entries.
19
20- >>> queue_sizes['nonvirt'].keys()
21- [u'386']
22+ >>> for arch_tag in queue_sizes['nonvirt']:
23+ ... print(arch_tag)
24+ 386
25
26 The virtualized build queue for 386 is also empty.
27
28diff --git a/lib/lp/buildmaster/doc/buildqueue.txt b/lib/lp/buildmaster/doc/buildqueue.txt
29index d39e096..e55c68a 100644
30--- a/lib/lp/buildmaster/doc/buildqueue.txt
31+++ b/lib/lp/buildmaster/doc/buildqueue.txt
32@@ -51,16 +51,16 @@ the job in question:
33 The 'builder' attribute provides the IBuilder instance of the builder
34 currently processing this job:
35
36- >>> bq.builder.name
37- u'bob'
38+ >>> print(bq.builder.name)
39+ bob
40
41 'logtail' is a text field which stores up to 1 Kbyte of the last
42 logged actions during the build process, it is updated according to the
43 frequency set in buildd-slavescanner, normally 10 seconds, see
44 buildd-slavescanner.txt for further information:
45
46- >>> bq.logtail
47- u'Dummy sampledata entry, not processing'
48+ >>> print(bq.logtail)
49+ Dummy sampledata entry, not processing
50
51 'lastscore' is the heuristic index generated by queuebuilder to order
52 the dispatching process, see more information in

Subscribers

People subscribed via source and target branches

to status/vote changes: