[Checkins] SVN: zc.buildout/branches/python-3-2/ checkpoint

Jim Fulton jim at zope.com
Sat Mar 19 14:28:56 EDT 2011


Log message for revision 121046:
  checkpoint

Changed:
  U   zc.buildout/branches/python-3-2/CHANGES.txt
  U   zc.buildout/branches/python-3-2/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt
  U   zc.buildout/branches/python-3-2/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py
  U   zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/README.txt
  U   zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/api.txt
  U   zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/custom.txt
  U   zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt

-=-
Modified: zc.buildout/branches/python-3-2/CHANGES.txt
===================================================================
--- zc.buildout/branches/python-3-2/CHANGES.txt	2011-03-19 17:39:43 UTC (rev 121045)
+++ zc.buildout/branches/python-3-2/CHANGES.txt	2011-03-19 18:28:55 UTC (rev 121046)
@@ -710,11 +710,11 @@
   the buildout script in the sample buildout.  This allows tests to
   use
 
-    >>> print system(buildout),
+    >>> run(buildout)
 
   rather than:
 
-    >>> print system(join('bin', 'buildout')),
+    >>> run(join('bin', 'buildout'))
 
 
 Bugs Fixed

Modified: zc.buildout/branches/python-3-2/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt
===================================================================
--- zc.buildout/branches/python-3-2/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt	2011-03-19 17:39:43 UTC (rev 121045)
+++ zc.buildout/branches/python-3-2/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt	2011-03-19 18:28:55 UTC (rev 121046)
@@ -111,7 +111,7 @@
     ... index = %(server)s/index
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Installing demo.
     Getting distribution for 'demo<0.3'.
     Got demo 0.2.
@@ -119,7 +119,7 @@
     Got demoneeded 1.2c1.
     Generated script '/sample-buildout/bin/demo'.
 
-    >>> print system(join(sample_buildout, 'bin', 'demo')),
+    >>> run(join(sample_buildout, 'bin', 'demo'))
     2 2
 
 Interpreter generation
@@ -142,7 +142,7 @@
     ... interpreter = py
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Uninstalling demo.
     Installing demo.
     Generated script '/sample-buildout/bin/demo'.
@@ -163,7 +163,7 @@
     ... index = %(server)s/index
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Uninstalling demo.
     Installing py.
     Generated interpreter '/sample-buildout/bin/py'.
@@ -198,11 +198,10 @@
 
 Here's an example of using the generated interpreter.
 
-    >>> print system(join(sample_buildout, 'bin', 'py') +
+    >>> run(join(sample_buildout, 'bin', 'py') +
     ...              ' -c "import sys, pprint; pprint.pprint(sys.path[-2:])"')
     ['/sample-buildout/eggs/demo-0.2-pyN.N.egg',
      '/sample-buildout/eggs/demoneeded-1.2c1-pyN.N.egg']
-    <BLANKLINE>
 
 Including site-packages and sitecustomize
 -----------------------------------------
@@ -243,7 +242,7 @@
     ... import os
     ... os.environ['zc.buildout'] = 'foo bar baz shazam'
     ... ''')
-    >>> print site_packages_path
+    >>> print(site_packages_path)
     /executable_buildout/site-packages
 
 Now let's take a look at include-site-packages.
@@ -264,14 +263,14 @@
     ... index = %(server)s/index
     ... """ % dict(server=link_server, py_path=py_path))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Uninstalling py.
     Installing py.
     Generated interpreter '/sample-buildout/bin/py'.
 
 Now executable_buildout/site-packages is included in sys.path.
 
-    >>> print system(join(sample_buildout, 'bin', 'py') +
+    >>> run(join(sample_buildout, 'bin', 'py') +
     ...              ''' -c "import sys, pprint; pprint.pprint(sys.path)"''')
     ... # doctest: +ELLIPSIS
     ['',
@@ -281,7 +280,6 @@
      '/sample-buildout/eggs/demoneeded-1.2c1-pyN.N.egg',
      '/executable_buildout/eggs/setuptools-X-pyN.N.egg',
      '/executable_buildout/site-packages']
-    <BLANKLINE>
 
 If you set it to false, they are excluded.
 
@@ -300,12 +298,12 @@
     ... index = %(server)s/index
     ... """ % dict(server=link_server, py_path=py_path))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Uninstalling py.
     Installing py.
     Generated interpreter '/sample-buildout/bin/py'.
 
-    >>> print system(join(sample_buildout, 'bin', 'py') +
+    >>> run(join(sample_buildout, 'bin', 'py') +
     ...              ''' -c "import sys, pprint; pprint.pprint(sys.path)"''')
     ... # doctest: +ELLIPSIS
     ['',
@@ -313,7 +311,6 @@
      ...,
      '/sample-buildout/eggs/demo-0.2-pyN.N.egg',
      '/sample-buildout/eggs/demoneeded-1.2c1-pyN.N.egg']
-    <BLANKLINE>
 
 As described above, the allowed-eggs-from-site-packages option lets us
 control what site-packages eggs zc.buildout will allow to fulfill
@@ -359,7 +356,7 @@
     ... eggs = demoneeded
     ... ''' % globals())
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Creating directory '/sample-buildout/tmpeggs'.
     Uninstalling py.
     Installing eggs.
@@ -387,7 +384,7 @@
     ... allowed-eggs-from-site-packages =
     ... eggs = demoneeded
     ... ''' % globals())
-    >>> print system(buildout),
+    >>> run(buildout)
     Creating directory '/sample-buildout/tmpeggs'.
     Uninstalling eggs.
     Installing eggs.
@@ -426,7 +423,7 @@
     ... eggs = demoneeded
     ... ''' % globals())
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Installing eggs.
 
    This fails:
@@ -449,7 +446,7 @@
     ... python = primed_python
     ... eggs = demoneeded
     ... ''' % globals())
-    >>> print system(buildout),
+    >>> run(buildout)
     Creating directory '/sample-buildout/tmpeggs'.
     Uninstalling eggs.
     Installing eggs.
@@ -483,7 +480,7 @@
     ... index = %(server)s/index
     ... """ % dict(server=link_server, py_path=py_path))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Installing py.
     Generated interpreter '/sample-buildout/bin/py'.
 
@@ -496,10 +493,9 @@
     import os
     os.environ['zc.buildout'] = 'foo bar baz shazam'
 
-    >>> print system(join(sample_buildout, 'bin', 'py') +
-    ...              ''' -c "import os; print os.environ['zc.buildout']"''')
+    >>> run(join(sample_buildout, 'bin', 'py') +
+    ...              ''' -c "import os; print(os.environ['zc.buildout'])"''')
     foo bar baz shazam
-    <BLANKLINE>
 
 It also will be honored in the buildout section if it is not set locally.
 
@@ -520,7 +516,7 @@
     ... index = %(server)s/index
     ... """ % dict(server=link_server, py_path=py_path))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Updating py.
 
     >>> cat(sample_buildout, 'parts', 'py', 'sitecustomize.py')
@@ -532,10 +528,9 @@
     import os
     os.environ['zc.buildout'] = 'foo bar baz shazam'
 
-    >>> print system(join(sample_buildout, 'bin', 'py') +
-    ...              ''' -c "import os; print os.environ['zc.buildout']"''')
+    >>> run(join(sample_buildout, 'bin', 'py') +
+    ...              ''' -c "import os; print(os.environ['zc.buildout'])"''')
     foo bar baz shazam
-    <BLANKLINE>
 
 Options
 -------
@@ -573,20 +568,20 @@
 
 Now let's put it in action.
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Uninstalling py.
     Installing demo.
     Generated script '/sample-buildout/bin/demo'.
     Installing python.
     Generated interpreter '/sample-buildout/bin/python'.
 
-    >>> print system(join(sample_buildout, 'bin', 'python') +
+    >>> run(join(sample_buildout, 'bin', 'python') +
     ...              ' -c "import sys, pprint; pprint.pprint(sys.path[-2:])"')
     ['/sample-buildout/eggs/demo-0.2-pyN.N.egg',
      '/sample-buildout/eggs/demoneeded-1.2c1-pyN.N.egg']
-    <BLANKLINE>
-    >>> print system(join(sample_buildout, 'bin', 'python') +
-    ...              ''' -c "import os; print os.environ['zc.buildout']"'''),
+
+    >>> run(join(sample_buildout, 'bin', 'python') +
+    ...              ''' -c "import os; print(os.environ['zc.buildout'])"''')
     foo bar baz shazam
 
 Note that the parts/py directory has been cleaned up, and parts/python has
@@ -612,21 +607,21 @@
     ... index = %(server)s/index
     ... interpreter = py
     ... script-initialization =
-    ...     print "Hi from the script"
+    ...     print("Hi from the script")
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Uninstalling python.
     Uninstalling demo.
     Installing demo.
     Generated script '/sample-buildout/bin/demo'.
     Generated interpreter '/sample-buildout/bin/py'.
 
-    >>> print system(join(sample_buildout, 'bin', 'py') +
-    ...              ''' -c "print 'Hi from the interpreter'"'''),
+    >>> run(join(sample_buildout, 'bin', 'py') +
+    ...              ''' -c "print('Hi from the interpreter')"''')
     Hi from the interpreter
 
-    >>> print system(join(sample_buildout, 'bin', 'demo')),
+    >>> run(join(sample_buildout, 'bin', 'demo'))
     Hi from the script
     2 2
 
@@ -646,14 +641,12 @@
     ... index = %(server)s/index
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Uninstalling demo.
     Installing interpreter.
     Generated interpreter '/sample-buildout/bin/python2'.
 
-    >>> print system(join(sample_buildout, 'bin', 'python2') +
-    ...              ' -c "print 42"')
+    >>> run(join(sample_buildout, 'bin', 'python2') + ' -c "print(42)"')
     42
-    <BLANKLINE>
 
 The other options all identical to zc.recipe.egg.

Modified: zc.buildout/branches/python-3-2/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py
===================================================================
--- zc.buildout/branches/python-3-2/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py	2011-03-19 17:39:43 UTC (rev 121045)
+++ zc.buildout/branches/python-3-2/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py	2011-03-19 18:28:55 UTC (rev 121046)
@@ -56,7 +56,7 @@
     ... python = custom_python
     ... ''' % dict(server=link_server, py_path=py_path))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Installing py.
     Getting distribution for 'demo<0.3'.
     Got demo 0.2.
@@ -64,8 +64,8 @@
     Got demoneeded 1.2c1.
     Generated interpreter '/sample-buildout/bin/py'.
 
-    >>> print system(join(sample_buildout, 'bin', 'py') +
-    ...              ''' -c "import os; print os.environ['zc.buildout']"'''),
+    >>> run(join(sample_buildout, 'bin', 'py') +
+    ...              ''' -c "import os; print(os.environ['zc.buildout'])"''')
     foo bar baz shazam
 """
 
@@ -96,11 +96,11 @@
     ...    ${buildout:directory}/spam
     ... ''' % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Installing py.
     Generated interpreter '/sample-buildout/bin/py'.
-    >>> print system(join(sample_buildout, 'bin', 'py') +
-    ...              ''' -c "import sys;print 'path' + ' '.join(sys.path)"''')
+    >>> run(join(sample_buildout, 'bin', 'py') +
+    ...              ''' -c "import sys;print('path' + ' '.join(sys.path))"''')
     ... # doctest:+ELLIPSIS
     path.../foo/bar /sample-buildout/spam...
 
@@ -126,7 +126,7 @@
     ... index = %(server)s/index
     ... ''' % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Installing py.
     Getting distribution for 'demo<0.3'.
     Got demo 0.2.
@@ -139,8 +139,8 @@
     <BLANKLINE>
     import os
     os.environ['zc.buildout'] = 'foo bar baz shazam'
-    >>> print system(join(sample_buildout, 'bin', 'py') +
-    ...              ''' -c "import os; print os.environ['zc.buildout']"'''),
+    >>> run(join(sample_buildout, 'bin', 'py') +
+    ...              ''' -c "import os; print(os.environ['zc.buildout'])"''')
     foo bar baz shazam
 
 This also works with the exec-sitecustomize option, processing local
@@ -172,7 +172,7 @@
     ... python = custom_python
     ... ''' % dict(server=link_server, py_path=py_path))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Uninstalling py.
     Installing py.
     Generated interpreter '/sample-buildout/bin/py'.
@@ -189,11 +189,11 @@
     import os
     os.environ['zc.buildout'] = 'foo bar baz shazam'
 
-    >>> print system(join(sample_buildout, 'bin', 'py') + ' -c ' +
-    ...              '''"import os; print os.environ['zc.recipe.egg']"'''),
+    >>> run(join(sample_buildout, 'bin', 'py') + ' -c ' +
+    ...              '''"import os; print(os.environ['zc.recipe.egg'])"''')
     baLOOba
-    >>> print system(join(sample_buildout, 'bin', 'py') +
-    ...              ''' -c "import os; print os.environ['zc.buildout']"'''),
+    >>> (join(sample_buildout, 'bin', 'py') +
+    ...              ''' -c "import os; print(os.environ['zc.buildout'])"''')
     foo bar baz shazam
 
 """
@@ -223,7 +223,7 @@
     ...    ${buildout:directory}/spam
     ... ''' % dict(server=link_server))
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Installing py.
     Generated interpreter '/sample-buildout/bin/py'.
 
@@ -281,7 +281,7 @@
     ... eggs = demoneeded
     ... ''' % globals())
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Installing eggs.
 
 You can set the value false explicitly.  This makes it possible to
@@ -303,7 +303,7 @@
     ... python = primed_python
     ... eggs = demoneeded
     ... ''' % globals())
-    >>> print system(buildout)
+    >>> run(buildout)
     Uninstalling eggs.
     Installing eggs.
     Couldn't find index page for 'demoneeded' (maybe misspelled?)
@@ -312,7 +312,6 @@
       Installing eggs.
       Getting distribution for 'demoneeded'.
     Error: Couldn't find a distribution for 'demoneeded'.
-    <BLANKLINE>
 
 We get an error if we specify anything but true or false:
 
@@ -328,14 +327,12 @@
     ... eggs = other
     ... ''' % globals())
 
-    >>> print system(buildout)
+    >>> run(buildout)
     While:
       Installing.
       Getting section eggs.
       Initializing part eggs.
     Error: Invalid value for include-site-packages option: no
-    <BLANKLINE>
-
     """
 
 def allowed_eggs_from_site_packages_option():

Modified: zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/README.txt
===================================================================
--- zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2011-03-19 17:39:43 UTC (rev 121045)
+++ zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2011-03-19 18:28:55 UTC (rev 121046)
@@ -31,7 +31,7 @@
 
 We have a link server that has a number of distributions:
 
-    >>> print get(link_server),
+    >>> print_(get(link_server))
     <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>
@@ -223,7 +223,7 @@
     ... """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

Modified: zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/api.txt
===================================================================
--- zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/api.txt	2011-03-19 17:39:43 UTC (rev 121045)
+++ zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/api.txt	2011-03-19 18:28:55 UTC (rev 121046)
@@ -30,14 +30,14 @@
     ...     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: %s' % self.egg.extra_paths)
     ...         return ()
     ...
     ...     update = install

Modified: zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/custom.txt
===================================================================
--- zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/custom.txt	2011-03-19 17:39:43 UTC (rev 121045)
+++ zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/custom.txt	2011-03-19 18:28:55 UTC (rev 121046)
@@ -165,7 +165,7 @@
     ... """
     ... import extdemo
     ... def main():
-    ...     print extdemo.val
+    ...     print(extdemo.val)
     ... """)
 
     >>> write('demo', 'setup.py',
@@ -202,7 +202,7 @@
 
 When we run the script, we'll 42 printed:
 
-    >>> print system(join('bin', 'demo')),
+    >>> run(join('bin', 'demo'))
     42
 
 Updating
@@ -217,12 +217,12 @@
 
 If we run the buildout in non-newest or offline modes:
 
-    >>> print system(buildout+' -N'),
+    >>> run(buildout+' -N')
     Develop: '/sample-buildout/demo'
     Updating extdemo.
     Updating demo.
 
-    >>> print system(buildout+' -o'),
+    >>> run(buildout+' -o')
     Develop: '/sample-buildout/demo'
     Updating extdemo.
     Updating demo.
@@ -239,7 +239,7 @@
 will. This time we also get the test-variable message again, because the new
 version is imported:
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Develop: '/sample-buildout/demo'
     Updating extdemo.
     zip_safe flag not set; analyzing archive contents...
@@ -278,7 +278,7 @@
     ... entry-points = demo=demo:main
     ... """ % dict(server=link_server))
 
-    >>> print system(buildout+' -D'),
+    >>> run(buildout+' -D')
     Develop: '/sample-buildout/demo'
     Uninstalling demo.
     Uninstalling extdemo.
@@ -355,7 +355,7 @@
     ... recipe = recipes:environ
     ...
     ... """ % dict(server=link_server))
-    >>> print system(buildout),
+    >>> run(buildout)
     Develop: '/sample-buildout/recipes'
     Uninstalling demo.
     Uninstalling extdemo.
@@ -375,7 +375,7 @@
 
     >>> import os
     >>> os.environ['test-variable'] = 'bar'
-    >>> print system(buildout),
+    >>> run(buildout)
     Develop: '/sample-buildout/recipes'
     Updating extdemo.
     Updating checkenv.
@@ -409,7 +409,7 @@
     ... recipe = recipes:environ
     ...
     ... """ % dict(server=link_server))
-    >>> print system(buildout),
+    >>> run(buildout)
     Develop: '/sample-buildout/recipes'
     Uninstalling extdemo.
     Installing extdemo.
@@ -438,7 +438,7 @@
     ... include-dirs = include
     ...
     ... """ % dict(server=link_server))
-    >>> print system(buildout),
+    >>> run(buildout)
     Develop: '/sample-buildout/recipes'
     Uninstalling checkenv.
     Uninstalling extdemo.
@@ -545,7 +545,7 @@
 TWO to be defined.  This will cause the module-variable, 'val', to be
 set with a value of 2.
 
-    >>> print system(buildout),
+    >>> run(buildout)
     Develop: '/sample-buildout/demo'
     Uninstalling extdemo.
     Installing extdemo.
@@ -575,5 +575,5 @@
 Because develop eggs take precedence over non-develop eggs, the demo
 script will use the new develop egg:
 
-    >>> print system(join('bin', 'demo')),
+    >>> run(join('bin', 'demo'))
     2

Modified: zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
===================================================================
--- zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt	2011-03-19 17:39:43 UTC (rev 121045)
+++ zc.buildout/branches/python-3-2/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt	2011-03-19 18:28:55 UTC (rev 121046)
@@ -9,7 +9,7 @@
 
 We have a link server:
 
-    >>> print get(link_server),
+    >>> print_(get(link_server))
     <html><body>
     <a href="bigdemo-0.1-py2.5.egg">bigdemo-0.1-py2.5.egg</a><br>
     <a href="demo-0.1-py2.5.egg">demo-0.1-py2.5.egg</a><br>
@@ -50,7 +50,7 @@
    >>> import os
    >>> os.chdir(sample_buildout)
    >>> buildout = os.path.join(sample_buildout, 'bin', 'buildout')
-   >>> print system(buildout),
+   >>> run(buildout)
    Installing demo.
    Getting distribution for 'demo<0.3'.
    Got demo 0.2.
@@ -80,7 +80,7 @@
     ...     shebang = '#!'+shebang[3:-1]
     >>> shebang == '#!' + other_executable
     True
-    >>> print f.read(), # doctest: +NORMALIZE_WHITESPACE
+    >>> print_(f.read()) # doctest: +NORMALIZE_WHITESPACE
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
@@ -103,7 +103,7 @@
     ...     shebang = '#!'+shebang[3:-1]
     >>> shebang == '#!' + other_executable
     True
-    >>> print f.read(), # doctest: +NORMALIZE_WHITESPACE
+    >>> print_(f.read()) # doctest: +NORMALIZE_WHITESPACE
     <BLANKLINE>
     import sys
     <BLANKLINE>



More information about the checkins mailing list