[Checkins] SVN: zc.buildout/branches/regebro-python3/src/zc/buildout/test Fixed most prints
Lennart Regebro
regebro at gmail.com
Sat Jul 24 06:11:47 EDT 2010
Log message for revision 114984:
Fixed most prints
Changed:
U zc.buildout/branches/regebro-python3/src/zc/buildout/testing.py
U zc.buildout/branches/regebro-python3/src/zc/buildout/testrecipes.py
U zc.buildout/branches/regebro-python3/src/zc/buildout/tests.py
-=-
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/testing.py
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/testing.py 2010-07-24 08:25:47 UTC (rev 114983)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/testing.py 2010-07-24 10:11:46 UTC (rev 114984)
@@ -59,13 +59,15 @@
names = os.listdir(dir)
names.sort()
for name in names:
+ res = []
if os.path.isdir(os.path.join(dir, name)):
- print 'd ',
+ res.append('d ')
elif os.path.islink(os.path.join(dir, name)):
- print 'l ',
+ res.append('l ')
else:
- print '- ',
- print name
+ res.append('- ')
+ res.append(name)
+ print(' '.join(res))
def mkdir(*path):
os.mkdir(os.path.join(*path))
@@ -169,7 +171,7 @@
if os.path.exists(e):
return e
else:
- cmd = 'python%s -c "import sys; print sys.executable"' % version
+ cmd = 'python%s -c "import sys; print(sys.executable)"' % version
p = subprocess.Popen(cmd,
shell=True,
stdin=subprocess.PIPE,
@@ -182,7 +184,7 @@
o.close()
if os.path.exists(e):
return e
- cmd = 'python -c "import sys; print \'%s.%s\' % sys.version_info[:2]"'
+ cmd = 'python -c "import sys; print(\'%s.%s\' % sys.version_info[:2])"'
p = subprocess.Popen(cmd,
shell=True,
stdin=subprocess.PIPE,
@@ -194,7 +196,7 @@
e = o.read().strip()
o.close()
if e == version:
- cmd = 'python -c "import sys; print sys.executable"'
+ cmd = 'python -c "import sys; print(sys.executable)"'
p = subprocess.Popen(cmd,
shell=True,
stdin=subprocess.PIPE,
@@ -492,7 +494,7 @@
def log_request(self, code):
if self.__server.__log:
- print '%s %s %s' % (self.command, code, self.path)
+ print('%s %s %s' % (self.command, code, self.path))
def _run(tree, port):
server_address = ('localhost', port)
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/testrecipes.py
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/testrecipes.py 2010-07-24 08:25:47 UTC (rev 114983)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/testrecipes.py 2010-07-24 10:11:46 UTC (rev 114984)
@@ -10,7 +10,7 @@
items = self.options.items()
items.sort()
for option, value in items:
- print " %s=%r" % (option, value)
+ print(" %s=%r" % (option, value))
return ()
update = install
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/tests.py 2010-07-24 08:25:47 UTC (rev 114983)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/tests.py 2010-07-24 10:11:46 UTC (rev 114984)
@@ -48,14 +48,14 @@
... parts =
... ''')
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/foo'
+ <BLANKLINE>
>>> ls('develop-eggs')
- foo.egg-link
- z3c.recipe.scripts.egg-link
- zc.recipe.egg.egg-link
-
"""
def develop_verbose():
@@ -76,25 +76,26 @@
... parts =
... ''')
- >>> print system(join('bin', 'buildout')+' -vv'), # doctest: +ELLIPSIS
+ >>> print(system(join('bin', 'buildout')+' -vv')) # doctest: +ELLIPSIS
Installing...
Develop: '/sample-buildout/foo'
...
Installed /sample-buildout/foo
...
-
+ <BLANKLINE>
+
>>> ls('develop-eggs')
- foo.egg-link
- z3c.recipe.scripts.egg-link
- zc.recipe.egg.egg-link
- >>> print system(join('bin', 'buildout')+' -vvv'), # doctest: +ELLIPSIS
+ >>> print(system(join('bin', 'buildout')+' -vvv')) # doctest: +ELLIPSIS
Installing...
Develop: '/sample-buildout/foo'
in: '/sample-buildout/foo'
... -q develop -mxN -d /sample-buildout/develop-eggs/...
+ <BLANKLINE>
-
"""
def buildout_error_handling():
@@ -129,7 +130,7 @@
... z = ${buildout:x}
... ''')
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')))
... # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
While:
Initializing.
@@ -140,6 +141,7 @@
Getting option buildout:x.
Getting option buildout:y.
Error: Circular reference in substitutions.
+ <BLANKLINE>
It is an error to use funny characters in variable refereces:
@@ -151,7 +153,7 @@
... x = ${bui$ldout:y}
... ''')
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')))
While:
Initializing.
Getting section buildout.
@@ -159,6 +161,7 @@
Getting option buildout:x.
Error: The section name in substitution, ${bui$ldout:y},
has invalid characters.
+ <BLANKLINE>
>>> write(sample_buildout, 'buildout.cfg',
... '''
@@ -168,7 +171,7 @@
... x = ${buildout:y{z}
... ''')
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')))
While:
Initializing.
Getting section buildout.
@@ -176,7 +179,8 @@
Getting option buildout:x.
Error: The option name in substitution, ${buildout:y{z},
has invalid characters.
-
+ <BLANKLINE>
+
and too have too many or too few colons:
>>> write(sample_buildout, 'buildout.cfg',
@@ -187,7 +191,7 @@
... x = ${parts}
... ''')
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')))
While:
Initializing.
Getting section buildout.
@@ -195,7 +199,8 @@
Getting option buildout:x.
Error: The substitution, ${parts},
doesn't contain a colon.
-
+ <BLANKLINE>
+
>>> write(sample_buildout, 'buildout.cfg',
... '''
... [buildout]
@@ -204,7 +209,7 @@
... x = ${buildout:y:z}
... ''')
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')))
While:
Initializing.
Getting section buildout.
@@ -212,7 +217,8 @@
Getting option buildout:x.
Error: The substitution, ${buildout:y:z},
has too many colons.
-
+ <BLANKLINE>
+
Al parts have to have a section:
>>> write(sample_buildout, 'buildout.cfg',
@@ -221,11 +227,12 @@
... parts = x
... ''')
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')))
While:
Installing.
Getting section x.
Error: The referenced section, 'x', was not defined.
+ <BLANKLINE>
and all parts have to have a specified recipe:
@@ -239,10 +246,11 @@
... foo = 1
... ''')
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')))
While:
Installing.
Error: Missing option: x:recipe
+ <BLANKLINE>
"""
@@ -288,7 +296,7 @@
... samplez
... ''' % globals())
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/sampley'
Develop: '/sample-buildout/samplez'
Installing eggs.
@@ -299,6 +307,7 @@
Error: There is a version conflict.
We already have: demoneeded 1.1
but sampley 1 requires 'demoneeded==1.0'.
+ <BLANKLINE>
Here, we see that sampley required an older version of demoneeded. What
if we hadn't required sampley ourselves:
@@ -321,7 +330,7 @@
If we use the verbose switch, we can see where requirements are coming from:
- >>> print system(buildout+' -v'), # doctest: +ELLIPSIS
+ >>> print(system(buildout+' -v')) # doctest: +ELLIPSIS
Installing 'zc.buildout', 'setuptools'.
We have a develop egg: zc.buildout 1.0.0
We have the best distribution that satisfies 'setuptools'.
@@ -348,6 +357,7 @@
Error: There is a version conflict.
We already have: demoneeded 1.1
but sampley 1 requires 'demoneeded==1.0'.
+ <BLANKLINE>
"""
def show_who_requires_missing_distributions():
@@ -372,7 +382,7 @@
... eggs = samplea
... ''')
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/sampley'
Develop: '/sample-buildout/samplea'
Develop: '/sample-buildout/sampleb'
@@ -383,6 +393,7 @@
Installing eggs.
Getting distribution for 'demoneeded'.
Error: Couldn't find a distribution for 'demoneeded'.
+ <BLANKLINE>
"""
def show_eggs_from_site_packages():
@@ -420,7 +431,7 @@
indicate the eggs from site-packages that have been selected. You'll see
we have two: demo 0.3 and demoneeded 1.1.
- >>> print system(buildout+" -v")
+ >>> print(system(buildout+" -v"))
Installing 'zc.buildout', 'setuptools'.
We have a develop egg: zc.buildout V
We have the best distribution that satisfies 'setuptools'.
@@ -507,16 +518,20 @@
>>> os.chdir(sample_buildout)
>>> buildout = os.path.join(sample_buildout, 'bin', 'buildout')
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Installing debug.
+ <BLANKLINE>
+
If we run the buildout again, we shoudn't get a message about
uninstalling anything because the configuration hasn't changed.
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Updating debug.
+ <BLANKLINE>
+
"""
def finding_eggs_as_local_directories():
@@ -578,7 +593,7 @@
>>> write('demo', 'demo.py',
... '''
... def main():
- ... print 'Python 2.5'
+ ... print('Python 2.5')
... ''')
>>> write('buildout.cfg',
@@ -588,8 +603,9 @@
... parts =
... ''')
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/demo'
+ <BLANKLINE>
>>> import zc.buildout.easy_install
>>> ws = zc.buildout.easy_install.working_set(
@@ -598,9 +614,10 @@
... ['demo'], ws, sys.executable, 'bin'))
True
- >>> print system(join('bin', 'demo')),
+ >>> print(system(join('bin', 'demo')))
Python 2.5
-
+ <BLANKLINE>
+
Now, finally, let's test _get_version:
>>> zc.buildout.easy_install._get_version(join('bin', 'demo'))
@@ -617,18 +634,19 @@
... x = ${foo:bar}
... ''')
- >>> print system(buildout + ' foo:bar=1 -vv'), # doctest: +ELLIPSIS
+ >>> print(system(buildout + ' foo:bar=1 -vv')) # doctest: +ELLIPSIS
Installing 'zc.buildout', 'setuptools'.
...
[foo]
bar = 1
...
+ <BLANKLINE>
"""
def test_help():
"""
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')+' -h'),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')+' -h'))
... # doctest: +ELLIPSIS
Usage: buildout [options] [assignments] [command [command arguments]]
<BLANKLINE>
@@ -637,8 +655,8 @@
-h, --help
...
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')
- ... +' --help'),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')
+ ... +' --help'))
... # doctest: +ELLIPSIS
Usage: buildout [options] [assignments] [command [command arguments]]
<BLANKLINE>
@@ -664,13 +682,14 @@
... ''')
>>> os.chdir(d)
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')
- ... + ' bootstrap'),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')
+ ... + ' bootstrap'))
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'.
+ <BLANKLINE>
"""
@@ -691,16 +710,18 @@
... ''')
>>> os.chdir(d)
- >>> print system(os.path.join(sample_buildout, 'bin', 'buildout')
- ... + ' bootstrap'),
+ >>> print(system(os.path.join(sample_buildout, 'bin', 'buildout')
+ ... + ' bootstrap'))
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'.
+ <BLANKLINE>
- >>> print system(os.path.join('bin', 'buildout')),
+ >>> print(system(os.path.join('bin', 'buildout')))
Unused options for buildout: 'scripts' 'eggs'.
+ <BLANKLINE>
"""
@@ -723,8 +744,9 @@
... parts =
... """)
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/foo'
+ <BLANKLINE>
>>> ls('develop-eggs')
- foox.egg-link
@@ -746,9 +768,10 @@
... parts =
... """)
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/foo'
Develop: '/sample-buildout/bar'
+ <BLANKLINE>
>>> ls('develop-eggs')
- foox.egg-link
@@ -764,8 +787,9 @@
... develop = bar
... parts =
... """)
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/bar'
+ <BLANKLINE>
It is gone
@@ -781,7 +805,8 @@
... [buildout]
... parts =
... """)
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
+ <BLANKLINE>
All gone
@@ -827,8 +852,9 @@
... parts =
... """)
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/foo'
+ <BLANKLINE>
Now, if we generate a working set using the egg link, we will get a warning
and we will get setuptools included in the working set.
@@ -846,7 +872,7 @@
... ])]
['foox', 'setuptools']
- >>> print handler
+ >>> print(handler)
zc.buildout.easy_install WARNING
Develop distribution: foox 0.0.0
uses namespace packages but the distribution does not require setuptools.
@@ -864,7 +890,7 @@
- z3c.recipe.scripts.egg-link
- zc.recipe.egg.egg-link
- >>> print 'START ->'; ls('eggs') # doctest: +ELLIPSIS
+ >>> print('START ->'); ls('eggs') # doctest: +ELLIPSIS
START...
- foox-0.0.0-py2.4.egg
...
@@ -879,8 +905,10 @@
... ])]
['foox', 'setuptools']
- >>> print handler,
+ >>> print(handler)
+ <BLANKLINE>
+
We get the same behavior if the it is a depedency that uses a
namespace package.
@@ -900,9 +928,10 @@
... parts =
... """)
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/foo'
Develop: '/sample-buildout/bar'
+ <BLANKLINE>
>>> [dist.project_name
... for dist in zc.buildout.easy_install.working_set(
@@ -912,12 +941,11 @@
... ])]
['bar', 'foox', 'setuptools']
- >>> print handler,
+ >>> print(handler)
zc.buildout.easy_install WARNING
Develop distribution: foox 0.0.0
uses namespace packages but the distribution does not require setuptools.
-
>>> logging.getLogger('zc.buildout.easy_install').propagate = True
>>> handler.uninstall()
@@ -987,9 +1015,9 @@
... class Install:
... def __init__(*args): pass
... def install(self):
- ... print 'installing'
+ ... print('installing')
... return ()
- ... def uninstall(name, options): print 'uninstalling'
+ ... def uninstall(name, options): print('uninstalling')
... ''')
>>> write('buildout.cfg', '''
@@ -1000,10 +1028,11 @@
... recipe = recipes:demo
... ''')
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/recipes'
Installing demo.
installing
+ <BLANKLINE>
>>> write('buildout.cfg', '''
@@ -1015,13 +1044,14 @@
... x = 1
... ''')
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/recipes'
Uninstalling demo.
Running uninstall recipe.
uninstalling
Installing demo.
installing
+ <BLANKLINE>
>>> write('buildout.cfg', '''
@@ -1030,11 +1060,12 @@
... parts =
... ''')
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/recipes'
Uninstalling demo.
Running uninstall recipe.
uninstalling
+ <BLANKLINE>
"""
@@ -1045,7 +1076,7 @@
>>> write('demo', 'demo.py',
... """
... def ext(buildout):
- ... print 'ext', list(buildout)
+ ... print('ext' + ' ' + str(list(buildout)))
... """)
>>> write('demo', 'setup.py',
@@ -1070,8 +1101,9 @@
... offline = true
... """)
- >>> print system(join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(join(sample_buildout, 'bin', 'buildout')))
ext ['buildout']
+ <BLANKLINE>
'''
@@ -1108,22 +1140,25 @@
... ''')
- >>> print system(join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(join(sample_buildout, 'bin', 'buildout')))
Develop: '/sample-buildout/recipe'
Installing foo.
+ <BLANKLINE>
>>> mkdir('recipe', '.svn')
>>> mkdir('recipe', 'CVS')
- >>> print system(join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(join(sample_buildout, 'bin', 'buildout')))
Develop: '/sample-buildout/recipe'
Updating foo.
+ <BLANKLINE>
>>> write('recipe', '.svn', 'x', '1')
>>> write('recipe', 'CVS', 'x', '1')
- >>> print system(join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(join(sample_buildout, 'bin', 'buildout')))
Develop: '/sample-buildout/recipe'
Updating foo.
+ <BLANKLINE>
"""
@@ -1160,9 +1195,10 @@
... ''')
- >>> print system(join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(join(sample_buildout, 'bin', 'buildout')))
Develop: '/sample-buildout/recipe'
Installing foo.
+ <BLANKLINE>
>>> write('recipe', 'some-file', '1')
>>> os.symlink(join('recipe', 'some-file'),
@@ -1177,15 +1213,16 @@
>>> remove('recipe', 'some-file')
- >>> print system(join(sample_buildout, 'bin', 'buildout')),
+ >>> print(system(join(sample_buildout, 'bin', 'buildout')))
Develop: '/sample-buildout/recipe'
Updating foo.
-
+ <BLANKLINE>
+
"""
def o_option_sets_offline():
"""
- >>> print system(join(sample_buildout, 'bin', 'buildout')+' -vvo'),
+ >>> print(system(join(sample_buildout, 'bin', 'buildout')+' -vvo'))
... # doctest: +ELLIPSIS
<BLANKLINE>
...
@@ -1206,7 +1243,7 @@
... class Recipe:
... def __init__(*a): pass
... def install(self):
- ... print 'recipe v1'
+ ... print('recipe v1')
... return ()
... update = install
... ''')
@@ -1221,7 +1258,7 @@
>>> write('recipe', 'README', '')
- >>> print system(buildout+' setup recipe bdist_egg'), # doctest: +ELLIPSIS
+ >>> print(system(buildout+' setup recipe bdist_egg')) # doctest: +ELLIPSIS
Running setup script 'recipe/setup.py'.
...
@@ -1239,11 +1276,12 @@
... recipe = recipe
... ''' % join('recipe', 'dist'))
- >>> print system(buildout),
+ >>> print(system(buildout))
Getting distribution for 'recipe'.
Got recipe 1.
Installing foo.
recipe v1
+ <BLANKLINE>
Now, if we update the recipe egg:
@@ -1252,7 +1290,7 @@
... class Recipe:
... def __init__(*a): pass
... def install(self):
- ... print 'recipe v2'
+ ... print('recipe v2')
... return ()
... update = install
... ''')
@@ -1266,30 +1304,33 @@
... ''')
- >>> print system(buildout+' setup recipe bdist_egg'), # doctest: +ELLIPSIS
+ >>> print(system(buildout+' setup recipe bdist_egg')) # doctest: +ELLIPSIS
Running setup script 'recipe/setup.py'.
...
We won't get the update if we specify -N:
- >>> print system(buildout+' -N'),
+ >>> print(system(buildout+' -N'))
Updating foo.
recipe v1
+ <BLANKLINE>
or if we use -o:
- >>> print system(buildout+' -o'),
+ >>> print(system(buildout+' -o'))
Updating foo.
recipe v1
+ <BLANKLINE>
But we will if we use neither of these:
- >>> print system(buildout),
+ >>> print(system(buildout))
Getting distribution for 'recipe'.
Got recipe 2.
Uninstalling foo.
Installing foo.
recipe v2
+ <BLANKLINE>
We can also select a particular recipe version:
@@ -1303,10 +1344,11 @@
... recipe = recipe ==1
... ''' % join('recipe', 'dist'))
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling foo.
Installing foo.
recipe v1
+ <BLANKLINE>
"""
@@ -1352,13 +1394,15 @@
... recipe = recipe
... ''')
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipe'
Installing foo.
+ <BLANKLINE>
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipe'
Updating foo.
+ <BLANKLINE>
>>> cat('.installed.cfg') # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
[buildout]
@@ -1388,7 +1432,7 @@
... ['demo==0.2'], dest,
... links=[link_server], index=link_server+'index/')
- >>> print handler # doctest: +ELLIPSIS
+ >>> print(handler) # doctest: +ELLIPSIS
zc.buildout.easy_install DEBUG
Installing 'demo==0.2'.
zc.buildout.easy_install DEBUG
@@ -1434,7 +1478,7 @@
... recipe = recipes:mkdir
... ''')
- >>> print system(buildout), # doctest: +ELLIPSIS
+ >>> print(system(buildout)) # doctest: +ELLIPSIS
Develop: '/sample-buildout/recipes'
While:
Installing.
@@ -1446,6 +1490,7 @@
Traceback (most recent call last):
...
NameError: global name 'os' is not defined
+ <BLANKLINE>
"""
def whine_about_unused_options():
@@ -1486,11 +1531,12 @@
... z = 1
... """)
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/.'
Unused options for buildout: 'a'.
Installing foo.
Unused options for foo: 'z'.
+ <BLANKLINE>
'''
def abnormal_exit():
@@ -1554,22 +1600,25 @@
... recipe = recipes:clean
... ''')
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Installing p1.
Installing p2.
Installing p3.
+ <BLANKLINE>
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Updating p1.
Updating p2.
Installing p3.
+ <BLANKLINE>
- >>> print system(buildout+' buildout:parts='),
+ >>> print(system(buildout+' buildout:parts='))
Develop: '/sample-buildout/recipes'
Uninstalling p2.
Uninstalling p1.
+ <BLANKLINE>
2. We exit while updating:
@@ -1592,25 +1641,28 @@
... recipe = recipes:clean
... ''')
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Installing p1.
Installing p2.
Installing p3.
Installing p4.
+ <BLANKLINE>
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Updating p1.
Updating p2.
Updating p3.
+ <BLANKLINE>
- >>> print system(buildout+' buildout:parts='),
+ >>> print(system(buildout+' buildout:parts='))
Develop: '/sample-buildout/recipes'
Uninstalling p2.
Uninstalling p1.
Uninstalling p4.
Uninstalling p3.
+ <BLANKLINE>
3. We exit while installing or updating after uninstalling:
@@ -1633,12 +1685,13 @@
... recipe = recipes:clean
... ''')
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Installing p1.
Installing p2.
Installing p3.
Installing p4.
+ <BLANKLINE>
>>> write('buildout.cfg',
... '''
@@ -1660,10 +1713,11 @@
... x = 1
... ''')
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling p4.
Updating p1.
+ <BLANKLINE>
>>> write('buildout.cfg',
... '''
@@ -1684,13 +1738,14 @@
... recipe = recipes:clean
... ''')
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling p1.
Installing p1.
Updating p2.
Updating p3.
Installing p4.
+ <BLANKLINE>
"""
@@ -1717,7 +1772,7 @@
... zip_safe=False)
... ''')
- >>> print system(buildout+' setup badegg sdist'), # doctest: +ELLIPSIS
+ >>> print(system(buildout+' setup badegg sdist')) # doctest: +ELLIPSIS
Running setup script 'badegg/setup.py'.
...
@@ -1739,7 +1794,7 @@
... scripts = buildout=bo
... ''' % globals())
- >>> print system(buildout);print 'X' # doctest: +ELLIPSIS
+ >>> print(system(buildout));print('X') # doctest: +ELLIPSIS
Installing eggs.
Getting distribution for 'badegg'.
Got badegg 1.
@@ -1801,16 +1856,18 @@
... eggs = demo
... ''' % globals())
- >>> print system(buildout),
+ >>> print(system(buildout))
Installing x.
Getting distribution for 'demo'.
Got demo 0.4c1.
Getting distribution for 'demoneeded'.
Got demoneeded 1.2c1.
Generated script '/sample-buildout/bin/demo'.
+ <BLANKLINE>
- >>> print system(join('bin', 'demo')),
+ >>> print(system(join('bin', 'demo')))
4 2
+ <BLANKLINE>
>>> write('buildout.cfg',
... '''
@@ -1823,15 +1880,17 @@
... eggs = demo ==0.1
... ''' % globals())
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling x.
Installing x.
Getting distribution for 'demo==0.1'.
Got demo 0.1.
Generated script '/sample-buildout/bin/demo'.
+ <BLANKLINE>
- >>> print system(join('bin', 'demo')),
+ >>> print(system(join('bin', 'demo')))
1 2
+ <BLANKLINE>
"""
def versions_section_ignored_for_dependency_in_favor_of_site_packages():
@@ -1852,9 +1911,9 @@
version 0.3 and demoneeded version 1.1.
>>> py_path = make_py_with_system_install(make_py, sample_eggs)
- >>> print call_py(
+ >>> print(call_py(
... py_path,
- ... "import tellmy.version; print tellmy.version.__version__"),
+ ... "import tellmy.version; print(tellmy.version.__version__)")),
1.1
Now here's a setup that would expose the bug, using the
@@ -1869,7 +1928,7 @@
>>> for dist in workingset:
... res = str(dist)
... if res.startswith('tellmy.version'):
- ... print res
+ ... print(res)
... break
tellmy.version 1.0
@@ -1889,9 +1948,9 @@
tellmy.version 1.1, and tellmy.fortune 1.0. tellmy.version 1.1 is installed.
>>> py_path = make_py_with_system_install(make_py, sample_eggs)
- >>> print call_py(
+ >>> print(call_py(
... py_path,
- ... "import tellmy.version; print tellmy.version.__version__")
+ ... "import tellmy.version; print(tellmy.version.__version__)"))
1.1
<BLANKLINE>
@@ -1918,12 +1977,12 @@
... demo
... script-initialization =
... import tellmy.version
- ... print tellmy.version.__version__
+ ... print(tellmy.version.__version__)
... import tellmy.fortune
- ... print tellmy.fortune.__version__
+ ... print(tellmy.fortune.__version__)
... ''' % globals())
- >>> print system(buildout)
+ >>> print(system(buildout))
Installing eggs.
Getting distribution for 'tellmy.version==1.0'.
Got tellmy.version 1.0.
@@ -1950,16 +2009,16 @@
we could not import tellmy.fortune at all. The following are the correct
results for the interpreter and for the script.
- >>> print call_py(
+ >>> print(call_py(
... join('bin', 'py'),
... "import tellmy.version; " +
- ... "print tellmy.version.__version__; " +
+ ... "print(tellmy.version.__version__); " +
... "import tellmy.fortune; " +
- ... "print tellmy.fortune.__version__") # doctest: +ELLIPSIS
+ ... "print(tellmy.fortune.__version__)")) # doctest: +ELLIPSIS
1.0
1.0...
- >>> print system(join('bin', 'demo'))
+ >>> print(system(join('bin', 'demo')))
1.0
1.0
4 2
@@ -2015,9 +2074,9 @@
... zc.buildout.testing.sys_install(tmp, site_packages_path)
... finally:
... shutil.rmtree(tmp)
- >>> print call_py(
+ >>> print(call_py(
... py_path,
- ... "import tellmy.version; print tellmy.version.__version__")
+ ... "import tellmy.version; print(tellmy.version.__version__)"))
1.0
<BLANKLINE>
>>> write('buildout.cfg',
@@ -2055,7 +2114,7 @@
the comment leading up to zc.buildout.easy_install._easy_install_cmd).
Now the install works correctly, as seen here.
- >>> print system(buildout)
+ >>> print(system(buildout))
Installing eggs.
Getting distribution for 'tellmy.version==1.1'.
Got tellmy.version 1.1.
@@ -2276,7 +2335,7 @@
>>> test = (
... "import subprocess, sys; subprocess.call("
... "[sys.executable, '-c', "
- ... "'import eggrecipedemo; print eggrecipedemo.x'])")
+ ... "'import eggrecipedemo; print(eggrecipedemo.x)'])")
>>> generated = zc.buildout.easy_install.sitepackage_safe_scripts(
... interpreter_bin_dir, ws, sys.executable, interpreter_parts_dir,
... reqs=['demo'], interpreter='py',
@@ -2284,13 +2343,13 @@
This works for the script.
- >>> print system(join(interpreter_bin_dir, 'demo'))
+ >>> print(system(join(interpreter_bin_dir, 'demo')))
3
<BLANKLINE>
This also works for the generated interpreter.
- >>> print call_py(join(interpreter_bin_dir, 'py'), test)
+ >>> print(call_py(join(interpreter_bin_dir, 'py'), test))
3
<BLANKLINE>
@@ -2313,17 +2372,18 @@
You can also see, actually more easily than in the other example, that we
have the desired eggs available.
- >>> print system(join(interpreter_bin_dir, 'demo')), # doctest: +ELLIPSIS
+ >>> print(system(join(interpreter_bin_dir, 'demo'))) # doctest: +ELLIPSIS
['',
'/interpreter/parts/interpreter',
'/sample-buildout/foo',
...
'/interpreter/eggs/demo-0.3-pyN.N.egg',
'/interpreter/eggs/demoneeded-1.1-pyN.N.egg']
+ <BLANKLINE>
This also works for the generated interpreter, with identical results.
- >>> print call_py(join(interpreter_bin_dir, 'py'), test),
+ >>> print(call_py(join(interpreter_bin_dir, 'py'), test))
... # doctest: +ELLIPSIS
['',
'/interpreter/parts/interpreter',
@@ -2331,6 +2391,7 @@
...
'/interpreter/eggs/demo-0.3-pyN.N.egg',
'/interpreter/eggs/demoneeded-1.1-pyN.N.egg']
+ <BLANKLINE>
>>> # Cleanup
>>> if original_pythonpath:
@@ -2416,7 +2477,7 @@
Now, it is handled smoothly.
- >>> print system(buildout)
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Getting distribution for 'demoneeded==1.2c1'.
Got demoneeded 1.2c1.
@@ -2477,7 +2538,7 @@
Now we actually run the buildout.
- >>> print system(buildout)
+ >>> print(system(buildout))
Develop: '/sample-buildout/ns'
Develop: '/sample-buildout/recipes'
Uninstalling dummy.
@@ -2494,8 +2555,8 @@
... p = subprocess.Popen(s, stdin=subprocess.PIPE,
... stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
... p.stdin.close()
- ... print p.stdout.read()
- ... print 'Exit:', bool(p.wait())
+ ... print(p.stdout.read())
+ ... print('Exit:' + ' ' + str(bool(p.wait())))
>>> call(buildout)
<BLANKLINE>
@@ -2566,11 +2627,11 @@
... import os
... class Bad:
... def __init__(self, *_):
- ... print os.getcwd()
+ ... print(os.getcwd())
... def install(self):
- ... print os.getcwd()
+ ... print(os.getcwd())
... os.chdir('bad_start')
- ... print os.getcwd()
+ ... print(os.getcwd())
... return ()
... ''')
@@ -2593,8 +2654,8 @@
... ''')
>>> os.chdir('bad_start')
- >>> print system(join(sample_buildout, 'bin', 'buildout')
- ... +' -c '+join(sample_buildout, 'buildout.cfg')),
+ >>> print(system(join(sample_buildout, 'bin', 'buildout')
+ ... +' -c '+join(sample_buildout, 'buildout.cfg')))
Develop: '/sample-buildout/.'
/sample-buildout
/sample-buildout
@@ -2604,6 +2665,7 @@
Installing b2.
/sample-buildout
/sample-buildout/bad_start
+ <BLANKLINE>
"""
@@ -2623,7 +2685,7 @@
>>> for dist in ws:
- ... print dist
+ ... print(dist)
demo 0.2
demoneeded 1.1
@@ -2636,13 +2698,12 @@
def bug_75607_buildout_should_not_run_if_it_creates_an_empty_buildout_cfg():
"""
>>> remove('buildout.cfg')
- >>> print system(buildout),
+ >>> print(system(buildout))
While:
Initializing.
Error: Couldn't open /sample-buildout/buildout.cfg
+ <BLANKLINE>
-
-
"""
def dealing_with_extremely_insane_dependencies():
@@ -2677,7 +2738,7 @@
... eggs = pack0
... ''')
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/pack0'
Develop: '/sample-buildout/pack1'
Develop: '/sample-buildout/pack2'
@@ -2690,10 +2751,11 @@
Installing pack1.
Getting distribution for 'pack5'.
Error: Couldn't find a distribution for 'pack5'.
+ <BLANKLINE>
However, if we run in verbose mode, we can see why packages were included:
- >>> print system(buildout+' -v'), # doctest: +ELLIPSIS
+ >>> print(system(buildout+' -v')) # doctest: +ELLIPSIS
Installing 'zc.buildout', 'setuptools'.
We have a develop egg: zc.buildout 1.0.0
We have the best distribution that satisfies 'setuptools'.
@@ -2733,6 +2795,7 @@
Installing pack1.
Getting distribution for 'pack5'.
Error: Couldn't find a distribution for 'pack5'.
+ <BLANKLINE>
"""
def read_find_links_to_load_extensions():
@@ -2758,7 +2821,7 @@
... },
... )
... ''')
- >>> print system(buildout+' setup '+src+' bdist_egg'),
+ >>> print(system(buildout+' setup '+src+' bdist_egg'))
... # doctest: +ELLIPSIS
Running setup ...
creating 'dist/wackyextension-1-...
@@ -2782,12 +2845,13 @@
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),
+ >>> print(system(buildout))
Getting distribution for 'wackyextension'.
Got wackyextension 1.
Installing demo.
Getting distribution for 'demoneeded'.
Got demoneeded 1.0.
+ <BLANKLINE>
"""
@@ -2804,7 +2868,7 @@
... setup(name='foo')
... ''')
- >>> print system(buildout+' setup test bdist_egg'), # doctest: +ELLIPSIS
+ >>> print(system(buildout+' setup test bdist_egg')) # doctest: +ELLIPSIS
Running setup script 'test/setup.py'.
...
@@ -2865,9 +2929,9 @@
)
if dist.extras:
- print 'downloaded', dist.version
+ print('downloaded' + ' ' + dist.version)
else:
- print 'had', dist.version
+ print('had' + ' ' + dist.version)
sys.path_importer_cache.clear()
def prefer_final():
@@ -2984,12 +3048,13 @@
... eggs = demo
... ''' % globals())
- >>> print system(buildout+' -v'), # doctest: +ELLIPSIS
+ >>> print(system(buildout+' -v')) # doctest: +ELLIPSIS
Installing 'zc.buildout', 'setuptools'.
...
Picked: demo = 0.4c1
...
Picked: demoneeded = 1.2c1
+ <BLANKLINE>
Here we see that the final versions of demo and demoneeded are used.
We get the same behavior if we add prefer-final = false
@@ -3006,12 +3071,13 @@
... eggs = demo
... ''' % globals())
- >>> print system(buildout+' -v'), # doctest: +ELLIPSIS
+ >>> print(system(buildout+' -v')) # doctest: +ELLIPSIS
Installing 'zc.buildout', 'setuptools'.
...
Picked: demo = 0.4c1
...
Picked: demoneeded = 1.2c1
+ <BLANKLINE>
If we specify prefer-final = true, we'll get the newest
distributions:
@@ -3028,12 +3094,13 @@
... eggs = demo
... ''' % globals())
- >>> print system(buildout+' -v'), # doctest: +ELLIPSIS
+ >>> print(system(buildout+' -v')) # doctest: +ELLIPSIS
Installing 'zc.buildout', 'setuptools'.
...
Picked: demo = 0.3
...
Picked: demoneeded = 1.1
+ <BLANKLINE>
We get an error if we specify anything but true or false:
@@ -3049,10 +3116,11 @@
... eggs = demo
... ''' % globals())
- >>> print system(buildout+' -v'), # doctest: +ELLIPSIS
+ >>> print(system(buildout+' -v')) # doctest: +ELLIPSIS
While:
Initializing.
Error: Invalid value for prefer-final option: no
+ <BLANKLINE>
"""
@@ -3079,8 +3147,9 @@
... parts =
... ''')
- >>> print system(join('bin', 'buildout')),
+ >>> print(system(join('bin', 'buildout')))
Develop: '/sample-buildout/foo'
+ <BLANKLINE>
>>> ls('develop-eggs')
- foo.egg-link
@@ -3130,10 +3199,11 @@
... pkg_resources.Requirement.parse('setuptools')).version,
... distribute_version))
- >>> print system(buildout),
+ >>> print(system(buildout))
Installing foo.
Getting distribution for 'foo==1'.
Got foo 1.
+ <BLANKLINE>
"""
@@ -3158,13 +3228,14 @@
>>> write('t.py',
... '''
... import eggrecipedemo, eggrecipedemoneeded
- ... print eggrecipedemo.main.func_code.co_filename
- ... print eggrecipedemoneeded.f.func_code.co_filename
+ ... print(eggrecipedemo.main.func_code.co_filename)
+ ... print(eggrecipedemoneeded.f.func_code.co_filename)
... ''')
- >>> print system(join('bin', 'py')+ ' t.py'),
+ >>> print(system(join('bin', 'py')+ ' t.py'))
/sample-buildout/eggs/demo-0.4c1-py2.4.egg/eggrecipedemo.py
/sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg/eggrecipedemoneeded.py
+ <BLANKLINE>
>>> import os
>>> for name in os.listdir('eggs'):
@@ -3185,7 +3256,8 @@
... eggs-directory = ${buildout:directory}/develop-eggs
... parts =
... ''' % globals())
- >>> print system(buildout),
+ >>> print(system(buildout))
+ <BLANKLINE>
"""
@@ -3216,10 +3288,11 @@
We can see that both eggs were found:
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/sampley'
Develop: '/sample-buildout/samplez'
Installing eggs.
+ <BLANKLINE>
"""
@@ -3248,10 +3321,11 @@
We should get one of the eggs, and a warning for the pattern that
did not match anything.
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/samplea'
Couldn't develop '/sample-buildout/grumble*' (not found)
Installing eggs.
+ <BLANKLINE>
"""
@@ -3303,13 +3377,14 @@
... <= p1
... ''')
- >>> print system(buildout),
+ >>> print(system(buildout))
Installing p1.
foo='1\n2 b'
recipe='zc.buildout:debug'
Installing p2.
foo='1\n2 b'
recipe='zc.buildout:debug'
+ <BLANKLINE>
"""
def increment_buildout_with_multiple_extended_files_421022():
@@ -3343,7 +3418,7 @@
... x = ${buildout:bar-option} ${buildout:foo-option}
... ''')
- >>> print system(buildout),
+ >>> print(system(buildout))
Installing p.
recipe='zc.buildout:debug'
x='bar\nbaz foo\nham'
@@ -3351,6 +3426,7 @@
bar-option='bar\nbaz'
foo-option='foo\nham'
recipe='zc.buildout:debug'
+ <BLANKLINE>
"""
def increment_on_command_line():
@@ -3370,13 +3446,14 @@
... <= p1
... ''')
- >>> print system(buildout+' buildout:parts+=p2 p1:foo+=bar'),
+ >>> print(system(buildout+' buildout:parts+=p2 p1:foo+=bar'))
Installing p1.
foo='1 a\nb\nbar'
recipe='zc.buildout:debug'
Installing p2.
foo='1 a\nb\nbar'
recipe='zc.buildout:debug'
+ <BLANKLINE>
"""
######################################################################
@@ -3443,7 +3520,7 @@
tmp, 'eggrecipedemo.py',
'import eggrecipedemoneeded\n'
'x=%s\n'
- 'def main(): print x, eggrecipedemoneeded.y\n'
+ 'def main(): print(str(x) + " " + str(eggrecipedemoneeded.y))\n'
% minor_version)
write(
tmp, 'setup.py',
@@ -3530,7 +3607,7 @@
from distutils.core import setup, Extension
if os.environ.get('test-variable'):
- print "Have environment test-variable:", os.environ['test-variable']
+ print("Have environment test-variable:" + " " + os.environ['test-variable'])
setup(name = "extdemo", version = "%s", url="http://www.zope.org",
author="Demo", author_email="demo at demo.com",
More information about the checkins
mailing list