Skip to content

Commit

Permalink
Fix too many values to unpack on Windows
Browse files Browse the repository at this point in the history
On Windows, zc.buildout.easy_install.scripts returns a 2 element list
containing py.exe and py-script.py
  • Loading branch information
daybarr committed Apr 24, 2017
1 parent aa7a031 commit cd635a9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/buildout/wheel/tests/testwheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ def test_install_wheels(self):
shutil.copytree(join(self.here, 'samples'), join(build, 'samples'))
ws = zc.buildout.easy_install.install(
['setuptools', 'wheel'], None, check_picked=False, path=sys.path)
[py] = zc.buildout.easy_install.scripts(
py = zc.buildout.easy_install.scripts(
[], ws, sys.executable, dest=build, interpreter='py')
os.chdir(join(build, 'samples', 'demo'))
zc.buildout.easy_install.call_subprocess(
[py, 'setup.py', 'bdist_wheel', '-d', eggs])
py + ['setup.py', 'bdist_wheel', '-d', eggs])
os.chdir(join('..', 'extdemo'))
zc.buildout.easy_install.call_subprocess(
[py, 'setup.py', 'bdist_wheel', '-d', eggs])
py + ['setup.py', 'bdist_wheel', '-d', eggs])
os.chdir(join('..'))

buildout = Buildout()
Expand All @@ -59,9 +59,9 @@ def unload():
index=eggs,
check_picked=False,
path=sys.path)
[py] = zc.buildout.easy_install.scripts(
py = zc.buildout.easy_install.scripts(
[], ws, sys.executable, dest=join(self.sample_buildout, 'bin'),
interpreter='py')
zc.buildout.easy_install.call_subprocess([py, 'getvals.py'])
zc.buildout.easy_install.call_subprocess(py + ['getvals.py'])
with open('vals') as f:
self.assertEqual('1 42', f.read())

0 comments on commit cd635a9

Please sign in to comment.