/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: 2018-11-16 12:20:11 UTC
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116122011-40m8t96o0bcy6e16
Fix E127

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/win32/bootstrap.py
30
30
    import pkg_resources
31
31
except ImportError:
32
32
    ez = {}
33
 
    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
34
 
                         ).read() in ez
 
33
    exec(urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
 
34
                         ).read(), ez)
35
35
    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
36
36
 
37
37
    import pkg_resources
51
51
 
52
52
if is_jython:
53
53
    import subprocess
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
 
54
 
 
55
    env = dict(
 
56
        os.environ,
 
57
        PYTHONPATH=ws.find(
 
58
            pkg_resources.Requirement.parse('setuptools')).location
 
59
        )
 
60
 
 
61
    assert subprocess.Popen(
 
62
        [sys.executable] + ['-c', quote(cmd), '-mqNxd',
 
63
        quote(tmpeggs), 'zc.buildout'], env=env,).wait() == 0
62
64
 
63
65
else:
64
66
    assert os.spawnle(
65
67
        os.P_WAIT, sys.executable, quote (sys.executable),
66
68
        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
67
 
        dict(os.environ,
 
69
        dict(
 
70
            os.environ,
68
71
            PYTHONPATH=
69
72
            ws.find(pkg_resources.Requirement.parse('setuptools')).location
70
73
            ),