/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/win32/bootstrap.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/win32/bootstrap.py
43
43
        else:
44
44
            return c
45
45
else:
46
 
    def quote(c):
 
46
    def quote (c):
47
47
        return c
48
48
 
49
49
cmd = 'from setuptools.command.easy_install import main; main()'
50
 
ws = pkg_resources.working_set
51
 
env = dict(
52
 
    os.environ,
53
 
    PYTHONPATH=ws.find(pkg_resources.Requirement.parse('setuptools')).location)
 
50
ws  = pkg_resources.working_set
54
51
 
55
52
if is_jython:
56
53
    import subprocess
57
 
 
58
 
    assert subprocess.Popen(
59
 
        [sys.executable] +
60
 
        ['-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout'],
61
 
        env=env,).wait() == 0
 
54
    
 
55
    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd', 
 
56
           quote(tmpeggs), 'zc.buildout'], 
 
57
           env=dict(os.environ,
 
58
               PYTHONPATH=
 
59
               ws.find(pkg_resources.Requirement.parse('setuptools')).location
 
60
               ),
 
61
           ).wait() == 0
62
62
 
63
63
else:
64
64
    assert os.spawnle(
65
 
        os.P_WAIT, sys.executable, quote(sys.executable),
66
 
        '-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout', env,
 
65
        os.P_WAIT, sys.executable, quote (sys.executable),
 
66
        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
 
67
        dict(os.environ,
 
68
            PYTHONPATH=
 
69
            ws.find(pkg_resources.Requirement.parse('setuptools')).location
 
70
            ),
67
71
        ) == 0
68
72
 
69
73
ws.add_entry(tmpeggs)