checkpoint

src/zc/buildout/allowhosts.txt

@@ -55,19 +55,15 @@ local files::
 
 Now we can run the buildout and make sure all attempts to dist.plone.org fails::
 
-    >>> print_(system(buildout))
+    >>> print_(system(buildout), end='') # doctest: +ELLIPSIS
     Develop: '/sample-buildout/allowdemo'
-    Installing eggs.
-    <BLANKLINE>
+    Installing eggs...
     Link to http://dist.plone.org ***BLOCKED*** by --allow-hosts
-    <BLANKLINE>
-    Couldn't find index page for 'kss.core' (maybe misspelled?)
-    Getting distribution for 'kss.core'.
+    ...
     While:
       Installing eggs.
       Getting distribution for 'kss.core'.
     Error: Couldn't find a distribution for 'kss.core'.
-    <BLANKLINE>
 
 That's what we wanted : this will prevent any attempt to access
 unwanted domains. For instance, some packages are listing in their
@@ -91,19 +87,15 @@ XXX (showcase with a svn:// file)
 
 Now we can run the buildout and make sure all attempts to dist.plone.org fails::
 
-    >>> print_(system(buildout))
+    >>> print_(system(buildout), end='') # doctest: +ELLIPSIS
     Develop: '/sample-buildout/allowdemo'
-    Installing eggs.
-    <BLANKLINE>
+    Installing eggs...
     Link to http://dist.plone.org ***BLOCKED*** by --allow-hosts
-    <BLANKLINE>
-    Couldn't find index page for 'kss.core' (maybe misspelled?)
-    Getting distribution for 'kss.core'.
+    ...
     While:
       Installing eggs.
       Getting distribution for 'kss.core'.
     Error: Couldn't find a distribution for 'kss.core'.
-    <BLANKLINE>
 
 Test for issues
 ---------------
@@ -121,15 +113,14 @@ Test for 1.0.5 breakage as in https://bugs.launchpad.net/zc.buildout/+bug/239212
     ... eggs=zc.buildout
     ... interpreter=python
     ... ''')
-    >>> print_('XX'; print system(buildout)) # doctest: +ELLIPSIS
+    >>> print_('XX'); print_(system(buildout), end='') # doctest: +ELLIPSIS
     X...
     Unused options for buildout: 'foo'.
     Installing python.
     Generated script '/sample-buildout/bin/buildout'.
     Generated interpreter '/sample-buildout/bin/python'.
-    <BLANKLINE>
 
-The bug 239212 above would have got us an *AttributeError* on *buildout._allow_hosts*.
-This was fixed in this changeset:
+The bug 239212 above would have got us an *AttributeError* on
+*buildout._allow_hosts*.  This was fixed in this changeset:
 http://svn.zope.org/zc.buildout/trunk/src/zc/buildout/buildout.py?rev=87309&r1=87277&r2=87309
 

src/zc/buildout/bootstrap.txt

@@ -20,7 +20,7 @@ Make sure the bootstrap script actually works::
     ... parts =
     ... ''')
     >>> write('bootstrap.py', open(bootstrap_py).read())
-    >>> print_('X'; print system(
+    >>> print_('X'); print_(system(
     ...     zc.buildout.easy_install._safe_arg(sys.executable)+' '+
     ...     'bootstrap.py')); print_('X') # doctest: +ELLIPSIS
     X...

src/zc/buildout/dependencylinks.txt

@@ -82,11 +82,10 @@ buildout to see where the egg comes from this time.
     ...     for egg in glob(join(sample_buildout, 'eggs', 'demoneeded*.egg')):
     ...         remove(sample_buildout, 'eggs', egg)
     >>> remove_demoneeded_egg()
-    >>> print_(system(buildout), end='')
+    >>> print_(system(buildout), end='') # doctest: +ELLIPSIS
     Develop: '/sample-buildout/depdemo'
     Updating eggs.
-    Couldn't find index page for 'demoneeded' (maybe misspelled?)
-    Getting distribution for 'demoneeded'.
+    ...
     While:
       Updating eggs.
       Getting distribution for 'demoneeded'.

src/zc/buildout/download.py

@@ -23,6 +23,7 @@ import os
 import os.path
 import re
 import shutil
+import sys
 import tempfile
 import urllib.request, urllib.parse, urllib.error
 import urllib.parse
@@ -183,7 +184,7 @@ class Download(object):
             e = sys.exc_info()[1]
             os.remove(tmp_path)
             raise zc.buildout.UserError("Error downloading extends for URL "
-                              "%s: %r" % (url, e[1:3]))
+                              "%s: %s" % (url, e))
         except Exception:
             os.remove(tmp_path)
             raise
@@ -201,7 +202,7 @@ class Download(object):
 
         """
         if self.hash_name:
-            return md5(url).hexdigest()
+            return md5(url.encode()).hexdigest()
         else:
             if re.match(r"^[A-Za-z]:\\", url):
                 url = 'file:' + url

src/zc/buildout/download.txt

@@ -75,13 +75,13 @@ We can also have the downloaded file's MD5 sum checked:
 ... except ImportError: from md5 import new as md5
 
 >>> path, is_temp = download(server_url+'foo.txt',
-...                          md5('This is a foo text.').hexdigest())
+...                          md5('This is a foo text.'.encode()).hexdigest())
 >>> is_temp
 True
 >>> remove(path)
 
 >>> download(server_url+'foo.txt',
-...          md5('The wrong text.').hexdigest())
+...          md5('The wrong text.'.encode()).hexdigest())
 Traceback (most recent call last):
 ChecksumError: MD5 checksum mismatch downloading 'http://localhost/foo.txt'
 
@@ -89,11 +89,11 @@ The error message in the event of an MD5 checksum mismatch for a local file
 reads somewhat differently:
 
 >>> download(join(server_data, 'foo.txt'),
-...               md5('This is a foo text.').hexdigest())
+...               md5('This is a foo text.'.encode()).hexdigest())
 ('/sample_files/foo.txt', False)
 
 >>> download(join(server_data, 'foo.txt'),
-...          md5('The wrong text.').hexdigest())
+...          md5('The wrong text.'.encode()).hexdigest())
 Traceback (most recent call last):
 ChecksumError: MD5 checksum mismatch for local resource at '/sample_files/foo.txt'.
 
@@ -168,7 +168,7 @@ This is a foo text.
 If we specify an MD5 checksum for a file that is already in the cache, the
 cached copy's checksum will be verified:
 
->>> download(server_url+'foo.txt', md5('The wrong text.').hexdigest())
+>>> download(server_url+'foo.txt', md5('The wrong text.'.encode()).hexdigest())
 Traceback (most recent call last):
 ChecksumError: MD5 checksum mismatch for cached download
                from 'http://localhost/foo.txt' at '/download-cache/foo.txt'
@@ -247,7 +247,7 @@ This is a foo text.
 
 However, resources with checksum mismatches will not be copied to the cache:
 
->>> download(server_url+'foo.txt', md5('The wrong text.').hexdigest())
+>>> download(server_url+'foo.txt', md5('The wrong text.'.encode()).hexdigest())
 Traceback (most recent call last):
 ChecksumError: MD5 checksum mismatch downloading 'http://localhost/foo.txt'
 >>> ls(cache)
@@ -256,9 +256,11 @@ ChecksumError: MD5 checksum mismatch downloading 'http://localhost/foo.txt'
 
 If the file is completely missing it should notify the user of the error:
 
->>> download(server_url+'bar.txt')
+>>> download(server_url+'bar.txt') # doctest: +NORMALIZE_WHITESPACE
 Traceback (most recent call last):
-UserError: Error downloading extends for URL http://localhost/bar.txt: (404, 'Not Found')
+...
+UserError: Error downloading extends for URL http://localhost/bar.txt:
+HTTP Error 404: Not Found
 >>> ls(cache)
 
 Finally, let's see what happens if the download cache to be used doesn't exist
@@ -344,7 +346,8 @@ checksum since we don't know which port the server happens to listen at when
 the test is run, so we don't actually know the full URL of the file. Let's
 check that the checksum actually belongs to the particular URL used:
 
->>> path.lower() == join(cache, md5(server_url+'foo.txt').hexdigest()).lower()
+>>> (path.lower() ==
+...  join(cache, md5((server_url+'foo.txt').encode()).hexdigest()).lower())
 True
 
 The cached copy is used when downloading the file again:
@@ -366,7 +369,9 @@ cache under a different name:
 /download-cache/537b6d73267f8f4447586989af8c470e
 >>> path == path2
 False
->>> path2.lower() == join(cache, md5(server_url+'other/foo.txt').hexdigest()).lower()
+>>> (path2.lower() ==
+...  join(cache, md5((server_url+'other/foo.txt').encode()).hexdigest()
+...       ).lower())
 True
 >>> cat(path)
 This is a foo text.
@@ -446,7 +451,7 @@ When trying to download a resource whose checksum does not match, the cached
 copy will neither be used nor overwritten:
 
 >>> write(server_data, 'foo.txt', 'This is a foo text.')
->>> download(server_url+'foo.txt', md5('The wrong text.').hexdigest())
+>>> download(server_url+'foo.txt', md5('The wrong text.'.encode()).hexdigest())
 Traceback (most recent call last):
 ChecksumError: MD5 checksum mismatch downloading 'http://localhost/foo.txt'
 >>> cat(cache, 'foo.txt')
@@ -539,9 +544,10 @@ conversions:
 
 >>> text = 'First line of text.\r\nSecond line.\r\n'
 >>> f = open(join(server_data, 'foo.txt'), 'wb')
->>> f.write(text)
+>>> _ = f.write(text.encode())
 >>> f.close()
->>> path, is_temp = Download()(server_url+'foo.txt', md5(text).hexdigest())
+>>> path, is_temp = Download()(server_url+'foo.txt',
+...                            md5(text.encode()).hexdigest())
 >>> remove(path)
 
 When "downloading" a directory given by file-system path or ``file:`` URL and

src/zc/buildout/repeatable.txt

@@ -22,7 +22,7 @@ To see how this works, we'll create two versions of a recipe egg:
     >>> write('recipe', 'recipe.py',
     ... '''
     ... import sys
-    ... print_ = lambda *a: sys.stdout.write(' '.join(map(str, a))+'\n')
+    ... print_ = lambda *a: sys.stdout.write(' '.join(map(str, a))+'\\n')
     ... class Recipe:
     ...     def __init__(*a): pass
     ...     def install(self):
@@ -50,7 +50,7 @@ To see how this works, we'll create two versions of a recipe egg:
     >>> write('recipe', 'recipe.py',
     ... '''
     ... import sys
-    ... print_ = lambda *a: sys.stdout.write(' '.join(map(str, a))+'\n')
+    ... print_ = lambda *a: sys.stdout.write(' '.join(map(str, a))+'\\n')
     ... class Recipe:
     ...     def __init__(*a): pass
     ...     def install(self):

src/zc/buildout/runsetup.txt

@@ -18,7 +18,7 @@ To illustrate this, we'll create a package in a sample buildout:
 
     >>> mkdir('hello')
     >>> write('hello', 'hello.py',
-    ...      'import sys; sys.stdout.write("Hello World!\n")\n')
+    ...      'import sys; sys.stdout.write("Hello World!\\n")\n')
     >>> write('hello', 'README', 'This is hello')
     >>> write('hello', 'setup.py',
     ... """

src/zc/buildout/tests.py

@@ -49,7 +49,7 @@ We should be able to deal with setup scripts that aren't setuptools based.
     ... parts =
     ... ''')
 
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
     Develop: '/sample-buildout/foo'
 
     >>> ls('develop-eggs')
@@ -76,7 +76,7 @@ We should be able to deal with setup scripts that aren't setuptools based.
     ... parts =
     ... ''')
 
-    >>> print_(system(join('bin', 'buildout')+' -vv'), end=' ')
+    >>> print_(system(join('bin', 'buildout')+' -vv'), end='')
     ... # doctest: +ELLIPSIS
     Installing...
     Develop: '/sample-buildout/foo'
@@ -88,7 +88,7 @@ We should be able to deal with setup scripts that aren't setuptools based.
     -  foo.egg-link
     -  zc.recipe.egg.egg-link
 
-    >>> print_(system(join('bin', 'buildout')+' -vvv'), end=' ')
+    >>> print_(system(join('bin', 'buildout')+' -vvv'), end='')
     ... # doctest: +ELLIPSIS
     Installing...
     Develop: '/sample-buildout/foo'
@@ -131,7 +131,7 @@ It is an error to create a variable-reference cycle:
     ... ''')
 
     >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')),
-    ...        end=' ')
+    ...        end='')
     ... # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
     While:
       Initializing.
@@ -154,7 +154,7 @@ It is an error to use funny characters in variable refereces:
     ... ''')
 
     >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')),
-    ...        end=' ')
+    ...        end='')
     While:
       Initializing.
       Getting section buildout.
@@ -172,7 +172,7 @@ It is an error to use funny characters in variable refereces:
     ... ''')
 
     >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')),
-    ...        end=' ')
+    ...        end='')
     While:
       Initializing.
       Getting section buildout.
@@ -192,7 +192,7 @@ and too have too many or too few colons:
     ... ''')
 
     >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')),
-    ...        end=' ')
+    ...        end='')
     While:
       Initializing.
       Getting section buildout.
@@ -210,7 +210,7 @@ and too have too many or too few colons:
     ... ''')
 
     >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')),
-    ...        end=' ')
+    ...        end='')
     While:
       Initializing.
       Getting section buildout.
@@ -228,7 +228,7 @@ Al parts have to have a section:
     ... ''')
 
     >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')),
-    ...        end=' ')
+    ...        end='')
     While:
       Installing.
       Getting section x.
@@ -247,7 +247,7 @@ and all parts have to have a specified recipe:
     ... ''')
 
     >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')),
-    ...        end=' ')
+    ...        end='')
     While:
       Installing.
     Error: Missing option: x:recipe
@@ -296,7 +296,7 @@ Now, let's create a buildout that requires y and z:
     ...        samplez
     ... ''' % globals())
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/sampley'
     Develop: '/sample-buildout/samplez'
     Installing eggs.
@@ -329,7 +329,7 @@ if we hadn't required sampley ourselves:
 
 If we use the verbose switch, we can see where requirements are coming from:
 
-    >>> print_(system(buildout+' -v'), end=' ') # doctest: +ELLIPSIS
+    >>> print_(system(buildout+' -v'), end='') # doctest: +ELLIPSIS
     Installing 'zc.buildout', 'distribute'.
     We have a develop egg: zc.buildout 1.0.0
     We have the best distribution that satisfies 'distribute'.
@@ -380,7 +380,7 @@ buildout will tell us who's asking for something that we can't find.
     ... eggs = samplea
     ... ''')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/sampley'
     Develop: '/sample-buildout/samplea'
     Develop: '/sample-buildout/sampleb'
@@ -457,14 +457,14 @@ the comparison with the saved value works correctly.
     >>> os.chdir(sample_buildout)
     >>> buildout = os.path.join(sample_buildout, 'bin', 'buildout')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Installing debug.
 
 If we run the buildout again, we shoudn't get a message about
 uninstalling anything because the configuration hasn't changed.
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Updating debug.
 """
@@ -518,7 +518,7 @@ def create_sections_on_command_line():
     ... x = ${foo:bar}
     ... ''')
 
-    >>> print_(system(buildout + ' foo:bar=1 -vv'), end=' ')
+    >>> print_(system(buildout + ' foo:bar=1 -vv'), end='')
     ...        # doctest: +ELLIPSIS
     Installing 'zc.buildout', 'distribute'.
     ...
@@ -567,7 +567,7 @@ bootstrapping.
 
     >>> os.chdir(d)
     >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')
-    ...              + ' bootstrap'), end=' ')
+    ...              + ' bootstrap'), end='')
     Creating directory '/sample-bootstrap/bin'.
     Creating directory '/sample-bootstrap/parts'.
     Creating directory '/sample-bootstrap/eggs'.
@@ -594,14 +594,14 @@ def bug_92891_bootstrap_crashes_with_egg_recipe_in_buildout_section():
 
     >>> os.chdir(d)
     >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')
-    ...              + ' bootstrap'), end=' ')
+    ...              + ' bootstrap'), end='')
     Creating directory '/sample-bootstrap/bin'.
     Creating directory '/sample-bootstrap/parts'.
     Creating directory '/sample-bootstrap/eggs'.
     Creating directory '/sample-bootstrap/develop-eggs'.
     Generated script '/sample-bootstrap/bin/buildout'.
 
-    >>> print_(system(os.path.join('bin', 'buildout')), end=' ')
+    >>> print_(system(os.path.join('bin', 'buildout')), end='')
     Unused options for buildout: 'scripts' 'eggs'.
 
     """
@@ -625,7 +625,7 @@ Create a develop egg:
     ... parts =
     ... """)
 
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
     Develop: '/sample-buildout/foo'
 
     >>> ls('develop-eggs')
@@ -647,7 +647,7 @@ Create another:
     ... parts =
     ... """)
 
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
     Develop: '/sample-buildout/foo'
     Develop: '/sample-buildout/bar'
 
@@ -664,7 +664,7 @@ Remove one:
     ... develop = bar
     ... parts =
     ... """)
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
     Develop: '/sample-buildout/bar'
 
 It is gone
@@ -680,7 +680,7 @@ Remove the other:
     ... [buildout]
     ... parts =
     ... """)
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
 
 All gone
 
@@ -725,7 +725,7 @@ a devlop egg, we will also generate a warning.
     ... parts =
     ... """)
 
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
     Develop: '/sample-buildout/foo'
 
 Now, if we generate a working set using the egg link, we will get a warning
@@ -776,7 +776,7 @@ We do not get a warning, but we do get distribute included in the working set:
     ...     ])]
     ['foox', 'distribute']
 
-    >>> print_(handler, end=' ')
+    >>> print_(handler, end='')
 
 We get the same behavior if the it is a depedency that uses a
 namespace package.
@@ -797,7 +797,7 @@ namespace package.
     ... parts =
     ... """)
 
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
     Develop: '/sample-buildout/foo'
     Develop: '/sample-buildout/bar'
 
@@ -809,7 +809,7 @@ namespace package.
     ...     ])]
     ['bar', 'foox', 'distribute']
 
-    >>> print_(handler, end=' ')
+    >>> print_(handler, end='')
     zc.buildout.easy_install WARNING
       Develop distribution: foox 0.0.0
     uses namespace packages but the distribution does not require distribute.
@@ -900,7 +900,7 @@ Uninstall recipes need to be called when a part is removed too:
     ... recipe = recipes:demo
     ... ''')
 
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
     Develop: '/sample-buildout/recipes'
     Installing demo.
     installing
@@ -915,7 +915,7 @@ Uninstall recipes need to be called when a part is removed too:
     ... x = 1
     ... ''')
 
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
     Develop: '/sample-buildout/recipes'
     Uninstalling demo.
     Running uninstall recipe.
@@ -930,7 +930,7 @@ Uninstall recipes need to be called when a part is removed too:
     ... parts =
     ... ''')
 
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
     Develop: '/sample-buildout/recipes'
     Uninstalling demo.
     Running uninstall recipe.
@@ -970,7 +970,7 @@ def extensions_installed_as_eggs_work_in_offline_mode():
     ... offline = true
     ... """)
 
-    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end=' ')
+    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end='')
     ext ['buildout']
 
 
@@ -1008,20 +1008,20 @@ changes in .svn or CVS directories.
     ... ''')
 
 
-    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end=' ')
+    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end='')
     Develop: '/sample-buildout/recipe'
     Installing foo.
 
     >>> mkdir('recipe', '.svn')
     >>> mkdir('recipe', 'CVS')
-    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end=' ')
+    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end='')
     Develop: '/sample-buildout/recipe'
     Updating foo.
 
     >>> write('recipe', '.svn', 'x', '1')
     >>> write('recipe', 'CVS', 'x', '1')
 
-    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end=' ')
+    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end='')
     Develop: '/sample-buildout/recipe'
     Updating foo.
 
@@ -1060,7 +1060,7 @@ because of the missing target file.
     ... ''')
 
 
-    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end=' ')
+    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end='')
     Develop: '/sample-buildout/recipe'
     Installing foo.
 
@@ -1077,7 +1077,7 @@ because of the missing target file.
 
     >>> remove('recipe', 'some-file')
 
-    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end=' ')
+    >>> print_(system(join(sample_buildout, 'bin', 'buildout')), end='')
     Develop: '/sample-buildout/recipe'
     Updating foo.
 
@@ -1085,7 +1085,7 @@ because of the missing target file.
 
 def o_option_sets_offline():
     """
-    >>> print_(system(join(sample_buildout, 'bin', 'buildout')+' -vvo'), end=' ')
+    >>> print_(system(join(sample_buildout, 'bin', 'buildout')+' -vvo'), end='')
     ... # doctest: +ELLIPSIS
     <BLANKLINE>
     ...
@@ -1140,7 +1140,7 @@ And update our buildout to use it.
     ... recipe = recipe
     ... ''' % join('recipe', 'dist'))
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Getting distribution for 'recipe'.
     Got recipe 1.
     Installing foo.
@@ -1174,19 +1174,19 @@ Now, if we update the recipe egg:
 
 We won't get the update if we specify -N:
 
-    >>> print_(system(buildout+' -N'), end=' ')
+    >>> print_(system(buildout+' -N'), end='')
     Updating foo.
     recipe v1
 
 or if we use -o:
 
-    >>> print_(system(buildout+' -o'), end=' ')
+    >>> print_(system(buildout+' -o'), end='')
     Updating foo.
     recipe v1
 
 But we will if we use neither of these:
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Getting distribution for 'recipe'.
     Got recipe 2.
     Uninstalling foo.
@@ -1205,7 +1205,7 @@ We can also select a particular recipe version:
     ... recipe = recipe ==1
     ... ''' % join('recipe', 'dist'))
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Uninstalling foo.
     Installing foo.
     recipe v1
@@ -1254,11 +1254,11 @@ uninstall
     ... recipe = recipe
     ... ''')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipe'
     Installing foo.
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipe'
     Updating foo.
 
@@ -1336,7 +1336,7 @@ def internal_errors():
     ... recipe = recipes:mkdir
     ... ''')
 
-    >>> print_(system(buildout), end=' ') # doctest: +ELLIPSIS
+    >>> print_(system(buildout), end='') # doctest: +ELLIPSIS
     Develop: '/sample-buildout/recipes'
     While:
       Installing.
@@ -1388,7 +1388,7 @@ def whine_about_unused_options():
     ... z = 1
     ... """)
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/.'
     Unused options for buildout: 'a'.
     Installing foo.
@@ -1456,19 +1456,19 @@ Now let's look at 3 cases:
     ... recipe = recipes:clean
     ... ''')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Installing p1.
     Installing p2.
     Installing p3.
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Updating p1.
     Updating p2.
     Installing p3.
 
-    >>> print_(system(buildout+' buildout:parts='), end=' ')
+    >>> print_(system(buildout+' buildout:parts='), end='')
     Develop: '/sample-buildout/recipes'
     Uninstalling p2.
     Uninstalling p1.
@@ -1494,20 +1494,20 @@ Now let's look at 3 cases:
     ... recipe = recipes:clean
     ... ''')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Installing p1.
     Installing p2.
     Installing p3.
     Installing p4.
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Updating p1.
     Updating p2.
     Updating p3.
 
-    >>> print_(system(buildout+' buildout:parts='), end=' ')
+    >>> print_(system(buildout+' buildout:parts='), end='')
     Develop: '/sample-buildout/recipes'
     Uninstalling p2.
     Uninstalling p1.
@@ -1535,7 +1535,7 @@ Now let's look at 3 cases:
     ... recipe = recipes:clean
     ... ''')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Installing p1.
     Installing p2.
@@ -1562,7 +1562,7 @@ Now let's look at 3 cases:
     ... x = 1
     ... ''')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Uninstalling p4.
     Updating p1.
@@ -1586,7 +1586,7 @@ Now let's look at 3 cases:
     ... recipe = recipes:clean
     ... ''')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Uninstalling p1.
     Installing p1.
@@ -1619,7 +1619,7 @@ def install_source_dist_with_bad_py():
     ...     zip_safe=False)
     ... ''')
 
-    >>> print_(system(buildout+' setup badegg sdist'), end=' ') # doctest: +ELLIPSIS
+    >>> print_(system(buildout+' setup badegg sdist'), end='') # doctest: +ELLIPSIS
     Running setup script 'badegg/setup.py'.
     ...
 
@@ -1703,7 +1703,7 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around():
     ... eggs = demo
     ... ''' % globals())
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Installing x.
     Getting distribution for 'demo'.
     Got demo 0.4c1.
@@ -1711,7 +1711,7 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around():
     Got demoneeded 1.2c1.
     Generated script '/sample-buildout/bin/demo'.
 
-    >>> print_(system(join('bin', 'demo')), end=' ')
+    >>> print_(system(join('bin', 'demo')), end='')
     4 2
 
     >>> write('buildout.cfg',
@@ -1725,14 +1725,14 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around():
     ... eggs = demo ==0.1
     ... ''' % globals())
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Uninstalling x.
     Installing x.
     Getting distribution for 'demo==0.1'.
     Got demo 0.1.
     Generated script '/sample-buildout/bin/demo'.
 
-    >>> print_(system(join('bin', 'demo')), end=' ')
+    >>> print_(system(join('bin', 'demo')), end='')
     1 2
     """
 
@@ -1814,9 +1814,11 @@ def bug_59270_recipes_always_start_in_buildout_dir():
     >>> write('bad_recipe.py',
     ... r'''
     ... import os, sys
+    ... def print_(*args):
+    ...     sys.stdout.write(' '.join(map(str, args)))
     ... class Bad:
     ...     def __init__(self, *_):
-    ...         print os.getcwd()
+    ...         print_(os.getcwd())
     ...     def install(self):
     ...         sys.stdout.write(os.getcwd()+'\n')
     ...         os.chdir('bad_start')
@@ -1844,7 +1846,7 @@ def bug_59270_recipes_always_start_in_buildout_dir():
 
     >>> os.chdir('bad_start')
     >>> print_(system(join(sample_buildout, 'bin', 'buildout')
-    ...              +' -c '+join(sample_buildout, 'buildout.cfg')), end=' ')
+    ...              +' -c '+join(sample_buildout, 'buildout.cfg')), end='')
     Develop: '/sample-buildout/.'
     /sample-buildout
     /sample-buildout
@@ -1886,7 +1888,7 @@ def bug_61890_file_urls_dont_seem_to_work_in_find_dash_links():
 def bug_75607_buildout_should_not_run_if_it_creates_an_empty_buildout_cfg():
     """
     >>> remove('buildout.cfg')
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     While:
       Initializing.
     Error: Couldn't open /sample-buildout/buildout.cfg
@@ -1927,7 +1929,7 @@ def dealing_with_extremely_insane_dependencies():
     ... eggs = pack0
     ... ''')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/pack0'
     Develop: '/sample-buildout/pack1'
     Develop: '/sample-buildout/pack2'
@@ -1943,7 +1945,7 @@ def dealing_with_extremely_insane_dependencies():
 
     However, if we run in verbose mode, we can see why packages were included:
 
-    >>> print_(system(buildout+' -v'), end=' ') # doctest: +ELLIPSIS
+    >>> print_(system(buildout+' -v'), end='') # doctest: +ELLIPSIS
     Installing 'zc.buildout', 'distribute'.
     We have a develop egg: zc.buildout 1.0.0
     We have the best distribution that satisfies 'distribute'.
@@ -2008,7 +2010,7 @@ We'll create a wacky buildout extension that is just another name for http:
     ...             },
     ...       )
     ... ''')
-    >>> print_(system(buildout+' setup '+src+' bdist_egg'), end=' ')
+    >>> print_(system(buildout+' setup '+src+' bdist_egg'), end='')
     ... # doctest: +ELLIPSIS
     Running setup ...
     creating 'dist/wackyextension-1-...
@@ -2032,7 +2034,7 @@ Now we'll create a buildout that uses this extension to load other packages:
 When we run the buildout. it will load the extension from the dist
 directory and then use the wacky extension to load the demo package
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Getting distribution for 'wackyextension'.
     Got wackyextension 1.
     Installing demo.
@@ -2233,7 +2235,7 @@ The default is prefer-final = false:
     ... eggs = demo
     ... ''' % globals())
 
-    >>> print_(system(buildout+' -v'), end=' ') # doctest: +ELLIPSIS
+    >>> print_(system(buildout+' -v'), end='') # doctest: +ELLIPSIS
     Installing 'zc.buildout', 'distribute'.
     ...
     Picked: demo = 0.4c1
@@ -2255,7 +2257,7 @@ We get the same behavior if we add prefer-final = false
     ... eggs = demo
     ... ''' % globals())
 
-    >>> print_(system(buildout+' -v'), end=' ') # doctest: +ELLIPSIS
+    >>> print_(system(buildout+' -v'), end='') # doctest: +ELLIPSIS
     Installing 'zc.buildout', 'distribute'.
     ...
     Picked: demo = 0.4c1
@@ -2277,7 +2279,7 @@ distributions:
     ... eggs = demo
     ... ''' % globals())
 
-    >>> print_(system(buildout+' -v'), end=' ') # doctest: +ELLIPSIS
+    >>> print_(system(buildout+' -v'), end='') # doctest: +ELLIPSIS
     Installing 'zc.buildout', 'distribute'.
     ...
     Picked: demo = 0.3
@@ -2298,7 +2300,7 @@ We get an error if we specify anything but true or false:
     ... eggs = demo
     ... ''' % globals())
 
-    >>> print_(system(buildout+' -v'), end=' ') # doctest: +ELLIPSIS
+    >>> print_(system(buildout+' -v'), end='') # doctest: +ELLIPSIS
     While:
       Initializing.
     Error: Invalid value for prefer-final option: no
@@ -2328,7 +2330,7 @@ Distribution setup scripts can import modules in the distribution directory:
     ... parts =
     ... ''')
 
-    >>> print_(system(join('bin', 'buildout')), end=' ')
+    >>> print_(system(join('bin', 'buildout')), end='')
     Develop: '/sample-buildout/foo'
 
     >>> ls('develop-eggs')
@@ -2369,7 +2371,7 @@ honoring our version specification.
     ... ''' % pkg_resources.working_set.find(
     ...    pkg_resources.Requirement.parse('distribute')).version)
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Installing foo.
     Getting distribution for 'foo==1'.
     Got foo 1.
@@ -2400,7 +2402,7 @@ def pyc_and_pyo_files_have_correct_paths():
     ... sys.stdout.write(eggrecipedemoneeded.f.func_code.co_filename+'\n')
     ... ''')
 
-    >>> print_(system(join('bin', 'py')+ ' t.py'), end=' ')
+    >>> print_(system(join('bin', 'py')+ ' t.py'), end='')
     /sample-buildout/eggs/demo-0.4c1-py2.4.egg/eggrecipedemo.py
     /sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg/eggrecipedemoneeded.py
 
@@ -2423,7 +2425,7 @@ def dont_mess_with_standard_dirs_with_variable_refs():
     ... eggs-directory = ${buildout:directory}/develop-eggs
     ... parts =
     ... ''' % globals())
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
 
     """
 
@@ -2454,7 +2456,7 @@ def expand_shell_patterns_in_develop_paths():
 
     We can see that both eggs were found:
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/sampley'
     Develop: '/sample-buildout/samplez'
     Installing eggs.
@@ -2486,7 +2488,7 @@ def warn_users_when_expanding_shell_patterns_yields_no_results():
     We should get one of the eggs, and a warning for the pattern that
     did not match anything.
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/samplea'
     Couldn't develop '/sample-buildout/grumble*' (not found)
     Installing eggs.
@@ -2541,7 +2543,7 @@ def increment_buildout_options():
     ... <= p1
     ... ''')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Installing p1.
       foo='1\n2 b'
       recipe='zc.buildout:debug'
@@ -2581,7 +2583,7 @@ def increment_buildout_with_multiple_extended_files_421022():
     ... x = ${buildout:bar-option} ${buildout:foo-option}
     ... ''')
 
-    >>> print_(system(buildout), end=' ')
+    >>> print_(system(buildout), end='')
     Installing p.
       recipe='zc.buildout:debug'
       x='bar\nbaz foo\nham'
@@ -2608,7 +2610,7 @@ def increment_on_command_line():
     ... <= p1
     ... ''')
 
-    >>> print_(system(buildout+' buildout:parts+=p2 p1:foo+=bar'), end=' ')
+    >>> print_(system(buildout+' buildout:parts+=p2 p1:foo+=bar'), end='')
     Installing p1.
       foo='1 a\nb\nbar'
       recipe='zc.buildout:debug'
@@ -2828,8 +2830,10 @@ def makeNewRelease(project, ws, dest, version='99.99'):
         zip = zipfile.ZipFile(dest, 'a')
         zip.writestr(
             'EGG-INFO/PKG-INFO',
-            zip.read('EGG-INFO/PKG-INFO').replace("Version: %s" % oldver,
-                                                  "Version: %s" % version)
+            ((zip.read('EGG-INFO/PKG-INFO').decode()
+              ).replace("Version: %s" % oldver,
+                        "Version: %s" % version)
+             ).encode()
             )
         zip.close()
     else:
@@ -2981,12 +2985,15 @@ def test_suite():
             setUp=zc.buildout.testing.buildoutSetUp,
             tearDown=zc.buildout.testing.buildoutTearDown,
             checker=renormalizing.RENormalizing([
-               zc.buildout.testing.normalize_path,
-               zc.buildout.testing.normalize_endings,
-               (re.compile(r'\S+buildout.py'), 'buildout.py'),
-               (re.compile(r'line \d+'), 'line NNN'),
-               (re.compile(r'py\(\d+\)'), 'py(NNN)'),
-               ])
+                zc.buildout.testing.normalize_path,
+                zc.buildout.testing.normalize_endings,
+                zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
+                (re.compile('zc.buildout.buildout.MissingOption'),
+                 'MissingOption'),
+                (re.compile(r'\S+buildout.py'), 'buildout.py'),
+                (re.compile(r'line \d+'), 'line NNN'),
+                (re.compile(r'py\(\d+\)'), 'py(NNN)'),
+                ])
             ),
 
         doctest.DocFileSuite(
@@ -3040,7 +3047,8 @@ def test_suite():
             tearDown=zc.buildout.testing.buildoutTearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
             checker=renormalizing.RENormalizing([
-               (re.compile(' at -?0x[^>]+'), '<MEM ADDRESS>'),
+                zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
+                (re.compile(' at -?0x[^>]+'), '<MEM ADDRESS>'),
                (re.compile('http://localhost:[0-9]{4,5}/'),
                 'http://localhost/'),
                (re.compile('[0-9a-f]{32}'), '<MD5 CHECKSUM>'),

src/zc/buildout/update.txt

@@ -35,7 +35,7 @@ zc.buildout used:
     ... """
     ... import pkg_resources
     ... import sys
-    ... print_ = lambda *a: sys.stdout.write(' '.join(map(str, a))+'\n')
+    ... print_ = lambda *a: sys.stdout.write(' '.join(map(str, a))+'\\n')
     ...
     ... class Recipe:
     ...
@@ -66,15 +66,18 @@ Now if we run the buildout, the buildout will upgrade itself to the
 new versions found in new releases:
 
     >>> print_(system(buildout), end='')
+    Getting distribution for 'zc.buildout'.
+    Got zc.buildout 99.99.
     Getting distribution for 'distribute'.
     Got distribute 99.99.
     Upgraded:
+      zc.buildout version 99.99,
       distribute version 99.99;
     restarting.
     Generated script '/sample-buildout/bin/buildout'.
     Develop: '/sample-buildout/showversions'
     Installing show-versions.
-    zc.buildout 1.4.4
+    zc.buildout 99.99
     distribute 99.99
 
 Our buildout script has been updated to use the new eggs:
@@ -84,7 +87,7 @@ Our buildout script has been updated to use the new eggs:
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
-      '/sample-buildout/eggs/zc.buildout-1.4.4-py2.4.egg',
+      '/sample-buildout/eggs/zc.buildout-99.99-py2.4.egg',
       '/sample-buildout/eggs/distribute-99.99-py2.4.egg',
       ]
     <BLANKLINE>
@@ -115,6 +118,7 @@ Now we can see that we actually "upgrade" to an earlier version.
 
     >>> print_(system(buildout), end='')
     Upgraded:
+      zc.buildout version 1.4.4;
       distribute version 0.6;
     restarting.
     Generated script '/sample-buildout/bin/buildout'.
@@ -140,7 +144,7 @@ We won't upgrade in offline mode:
     ... recipe = showversions
     ... """ % dict(new_releases=new_releases))
 
-    >>> print_(system(buildout+' -o'), ed='')
+    >>> print_(system(buildout+' -o'), end='')
     Develop: '/sample-buildout/showversions'
     Updating show-versions.
     zc.buildout 1.0.0
@@ -173,6 +177,8 @@ directory:
     Creating directory '/sample_buildout2/parts'.
     Creating directory '/sample_buildout2/eggs'.
     Creating directory '/sample_buildout2/develop-eggs'.
+    Getting distribution for 'zc.buildout'.
+    Got zc.buildout 99.99.
     Getting distribution for 'distribute'.
     Got distribute 99.99.
     Not upgrading because not running a local buildout command.

zc.recipe.egg_/src/zc/recipe/egg/README.txt

@@ -25,7 +25,7 @@ index
 
 We have a link server that has a number of distributions:
 
-    >>> print get(link_server),
+    >>> print_(get(link_server), end='')
     <html><body>
     <a href="bigdemo-0.1-py2.3.egg">bigdemo-0.1-py2.3.egg</a><br>
     <a href="demo-0.1-py2.3.egg">demo-0.1-py2.3.egg</a><br>
@@ -62,7 +62,7 @@ specified where to find distributions using the find-links option.
 Let's run the buildout:
 
     >>> import os
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Installing demo.
     Getting distribution for 'demo<0.3'.
     Got demo 0.2.
@@ -106,7 +106,7 @@ scripts recipe:
     ... index = %(server)s/index
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Uninstalling demo.
     Installing demo.
     Generated script '/sample-buildout/bin/demo'.
@@ -186,7 +186,7 @@ Note that we ommitted the entry point name from the recipe
 specification. We were able to do this because the scripts recipe is
 the default entry point for the zc.recipe.egg egg.
 
-   >>> print system(buildout),
+   >>> print_(system(buildout), end='')
    Uninstalling demo.
    Installing demo.
    Generated script '/sample-buildout/bin/demo'.
@@ -203,20 +203,20 @@ This is useful for debugging and testing.
 
 If we run the demo script, it prints out some minimal data:
 
-    >>> print system(join(sample_buildout, 'bin', 'demo')),
+    >>> print_(system(join(sample_buildout, 'bin', 'demo')), end='')
     2 2
 
 The value it prints out happens to be some values defined in the
 modules installed.
 
-We can also run the py-demo script.  Here we'll just print out
+We can also run the py-demo script.  Here we'll just print_(out)
 the bits if the path added to reflect the eggs:
 
-    >>> print system(join(sample_buildout, 'bin', 'py-demo'),
+    >>> print_(system(join(sample_buildout, 'bin', 'py-demo'), end='')
     ... """import os, sys
     ... for p in sys.path:
     ...     if 'demo' in p:
-    ...         print os.path.basename(p)
+    ...         print_(os.path.basename(p))
     ...
     ... """).replace('>>> ', '').replace('... ', ''),
     ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
@@ -244,7 +244,7 @@ remove the restriction on demo:
 
 and run the buildout in non-newest mode:
 
-    >>> print system(buildout+' -N'),
+    >>> print_(system(buildout+' -N'), end='')
     Uninstalling demo.
     Installing demo.
     Generated script '/sample-buildout/bin/demo'.
@@ -255,7 +255,7 @@ reinstalled.
 
 We'll also run the buildout in off-line mode:
 
-    >>> print system(buildout+' -o'),
+    >>> print_(system(buildout+' -o'), end='')
     Updating demo.
 
 We didn't get an update for demo:
@@ -269,7 +269,7 @@ We didn't get an update for demo:
 If we run the buildout on the default online and newest modes,
 we'll get an update for demo:
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Updating demo.
     Getting distribution for 'demo'.
     Got demo 0.4c1.
@@ -286,7 +286,7 @@ Then we'll get a new demo egg:
 
 The script is updated too:
 
-    >>> print system(join(sample_buildout, 'bin', 'demo')),
+    >>> print_(system(join(sample_buildout, 'bin', 'demo')), end='')
     4 2
 
 Controlling script generation
@@ -309,7 +309,7 @@ arguments:
     ... """ % dict(server=link_server))
 
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Uninstalling demo.
     Installing demo.
 
@@ -330,7 +330,7 @@ You can also control the name used for scripts:
     ... scripts = demo=foo
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Uninstalling demo.
     Installing demo.
     Generated script '/sample-buildout/bin/foo'.
@@ -360,7 +360,7 @@ extra-paths option:
     ...    ${buildout:directory}/spam
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Uninstalling demo.
     Installing demo.
     Generated script '/sample-buildout/bin/foo'.
@@ -407,7 +407,7 @@ breaking scripts.
     ...    ${buildout:directory}/spam
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Uninstalling demo.
     Installing demo.
     Generated script '/sample-buildout/bin/foo'.
@@ -456,7 +456,7 @@ each individual script section:
     ...    ${buildout:directory}/spam
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Uninstalling demo.
     Installing demo.
     Generated script '/sample-buildout/bin/foo'.
@@ -509,7 +509,7 @@ to be included in generated scripts:
     ... arguments = a, 2
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Uninstalling demo.
     Installing demo.
     Generated script '/sample-buildout/bin/foo'.
@@ -559,7 +559,7 @@ declare entry points using the entry-points option:
     ... entry-points = alt=eggrecipedemo:alt other=foo.bar:a.b.c
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Uninstalling demo.
     Installing demo.
     Generated script '/sample-buildout/bin/demo'.
@@ -606,7 +606,7 @@ generate all scripts in required packages:
     ... index = %(server)s/index
     ... dependent-scripts = true
     ... """ % dict(server=link_server))
-    >>> print system(buildout+' -N'),
+    >>> print_(system(buildout+' -N'), end='')
     Uninstalling demo.
     Installing bigdemo.
     Getting distribution for 'bigdemo'.
@@ -631,7 +631,7 @@ be made to contact an index server:
     ... scripts = demo=foo
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Uninstalling bigdemo.
     Installing demo.
     Generated script '/sample-buildout/bin/foo'.

zc.recipe.egg_/src/zc/recipe/egg/api.txt

@@ -17,9 +17,12 @@ around the egg recipe:
     >>> mkdir(sample_buildout, 'sample')
     >>> write(sample_buildout, 'sample', 'sample.py', 
     ... """
-    ... import logging, os
+    ... import logging, os, sys
     ... import zc.recipe.egg
     ...
+    ... def print_(*args):
+    ...     sys.stdout.write(' '.join(map(str, args)))
+    ...
     ... class Sample:
     ...
     ...     def __init__(self, buildout, name, options):
@@ -30,14 +33,14 @@ around the egg recipe:
     ...     def install(self):
     ...         extras = self.options['extras'].split()
     ...         requirements, ws = self.egg.working_set(extras)
-    ...         print 'Part:', self.name
-    ...         print 'Egg requirements:'
+    ...         print_('Part:', self.name)
+    ...         print_('Egg requirements:')
     ...         for r in requirements:
-    ...             print r
-    ...         print 'Working set:'
+    ...             print_(r)
+    ...         print_('Working set:')
     ...         for d in ws:
-    ...             print d
-    ...         print 'extra paths:', self.egg.extra_paths
+    ...             print_(d)
+    ...         print_('extra paths:', self.egg.extra_paths)
     ...         return ()
     ...
     ...     update = install
@@ -81,7 +84,7 @@ of extra requirements to be included in the working set.
     >>> import os
     >>> os.chdir(sample_buildout)
     >>> buildout = os.path.join(sample_buildout, 'bin', 'buildout')
-    >>> print system(buildout + ' -q'),
+    >>> print_(system(buildout + ' -q'), end='')
     Part: sample-part
     Egg requirements:
     demo<0.3
@@ -139,7 +142,7 @@ If we use the extra-paths option:
 Then we'll see that reflected in the extra_paths attribute in the egg
 recipe instance:
 
-    >>> print system(buildout + ' -q'),
+    >>> print_(system(buildout + ' -q'), end='')
     Part: sample-part
     Egg requirements:
     demo<0.3

zc.recipe.egg_/src/zc/recipe/egg/custom.txt

@@ -131,7 +131,7 @@ the egg:
     ...
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Installing extdemo.
     zip_safe flag not set; analyzing archive contents...
 
@@ -156,9 +156,11 @@ Let's define a script that uses out ext demo:
     >>> mkdir('demo')
     >>> write('demo', 'demo.py',
     ... """
-    ... import extdemo
+    ... import extdemo, sys
+    ... def print_(*args):
+    ...     sys.stdout.write(' '.join(map(str, args)))
     ... def main():
-    ...     print extdemo.val
+    ...     print_(extdemo.val)
     ... """)
 
     >>> write('demo', 'setup.py',
@@ -187,7 +189,7 @@ Let's define a script that uses out ext demo:
     ... entry-points = demo=demo:main
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/demo'
     Updating extdemo.
     Installing demo.
@@ -195,7 +197,7 @@ Let's define a script that uses out ext demo:
 
 When we run the script, we'll 42 printed:
 
-    >>> print system(join('bin', 'demo')),
+    >>> print_(system(join('bin', 'demo')), end='')
     42
 
 Updating
@@ -210,12 +212,12 @@ distribution for extdemo:
 
 If we run the buildout in non-newest or offline modes:
 
-    >>> print system(buildout+' -N'),
+    >>> print_(system(buildout+' -N'), end='')
     Develop: '/sample-buildout/demo'
     Updating extdemo.
     Updating demo.
 
-    >>> print system(buildout+' -o'),
+    >>> print_(system(buildout+' -o'), end='')
     Develop: '/sample-buildout/demo'
     Updating extdemo.
     Updating demo.
@@ -231,7 +233,7 @@ But if we run the buildout in the default on-line and newest modes, we
 will. This time we also get the test-variable message again, because the new
 version is imported:
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/demo'
     Updating extdemo.
     zip_safe flag not set; analyzing archive contents...
@@ -269,7 +271,7 @@ We can specify a specific version using the egg option:
     ... entry-points = demo=demo:main
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout+' -D'),
+    >>> print_(system(buildout+' -D'), end='')
     Develop: '/sample-buildout/demo'
     Uninstalling demo.
     Uninstalling extdemo.
@@ -345,7 +347,7 @@ Create our buildout:
     ... recipe = recipes:environ
     ...
     ... """ % dict(server=link_server))
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Uninstalling demo.
     Uninstalling extdemo.
@@ -365,7 +367,7 @@ the original value will be restored:
 
     >>> import os
     >>> os.environ['test-variable'] = 'bar'
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Updating extdemo.
     Updating checkenv.
@@ -399,7 +401,7 @@ are interpolated with os.environ before the're set:
     ... recipe = recipes:environ
     ...
     ... """ % dict(server=link_server))
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Uninstalling extdemo.
     Installing extdemo.
@@ -428,7 +430,7 @@ Create a clean buildout.cfg w/o the checkenv recipe, and delete the recipe:
     ... include-dirs = include
     ...
     ... """ % dict(server=link_server))
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/recipes'
     Uninstalling checkenv.
     Uninstalling extdemo.
@@ -529,7 +531,7 @@ Note that we added a define option to cause the preprocessor variable
 TWO to be defined.  This will cause the module-variable, 'val', to be
 set with a value of 2.
 
-    >>> print system(buildout),
+    >>> print_(system(buildout), end='')
     Develop: '/sample-buildout/demo'
     Uninstalling extdemo.
     Installing extdemo.
@@ -558,5 +560,5 @@ and the extdemo now has a built extension:
 Because develop eggs take precedence over non-develop eggs, the demo
 script will use the new develop egg:
 
-    >>> print system(join('bin', 'demo')),
+    >>> print_(system(join('bin', 'demo')), end='')
     2