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

[Colin Watson]

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

[Colin Watson (cjwatson)]

Self-approving for the same reason as https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/396328.

review: Approve

diff --git a/lib/lp/buildmaster/doc/builder.txt b/lib/lp/buildmaster/doc/builder.txt
index e8249ad..7fe82f7 100644
--- a/lib/lp/buildmaster/doc/builder.txt
+++ b/lib/lp/buildmaster/doc/builder.txt
@@ -74,8 +74,8 @@ The 'new' method will create a new builder in the database.
     >>> with admin_logged_in():
     ...     bnew = builderset.new(
     ...         [1], 'http://dummy.com:8221/', 'dummy', 'Dummy Title', 1)
-    >>> bnew.name
-    u'dummy'
+    >>> print(bnew.name)
+    dummy
 
 'getBuilders' returns builders with the 'active' flag set, ordered by
 virtualization status, architecture, then name.
@@ -102,8 +102,9 @@ Processor/virtualization.
 
 There are no 'amd64' build queue entries.
 
-    >>> queue_sizes['nonvirt'].keys()
-    [u'386']
+    >>> for arch_tag in queue_sizes['nonvirt']:
+    ...     print(arch_tag)
+    386
 
 The virtualized build queue for 386 is also empty.
 
diff --git a/lib/lp/buildmaster/doc/buildqueue.txt b/lib/lp/buildmaster/doc/buildqueue.txt
index d39e096..e55c68a 100644
--- a/lib/lp/buildmaster/doc/buildqueue.txt
+++ b/lib/lp/buildmaster/doc/buildqueue.txt
@@ -51,16 +51,16 @@ the job in question:
 The 'builder' attribute provides the IBuilder instance of the builder
 currently processing this job:
 
-    >>> bq.builder.name
-    u'bob'
+    >>> print(bq.builder.name)
+    bob
 
 'logtail' is a text field which stores up to 1 Kbyte of the last
 logged actions during the build process, it is updated according to the
 frequency set in buildd-slavescanner, normally 10 seconds, see
 buildd-slavescanner.txt for further information:
 
-    >>> bq.logtail
-    u'Dummy sampledata entry, not processing'
+    >>> print(bq.logtail)
+    Dummy sampledata entry, not processing
 
 'lastscore' is the heuristic index generated by queuebuilder to order
 the dispatching process, see more information in