/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 19:38:57 UTC
  • mfrom: (7143.16.21 even-more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116193857-bs5oma2655sp55qu
Fix another dozen flake8 errors.

Merged from https://code.launchpad.net/~jelmer/brz/even-more-cleanups/+merge/358931

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
 
50
ws = pkg_resources.working_set
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] +
 
63
        ['-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout'],
 
64
        env=env,).wait() == 0
62
65
 
63
66
else:
64
67
    assert os.spawnle(
65
 
        os.P_WAIT, sys.executable, quote (sys.executable),
66
 
        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
67
 
        dict(os.environ,
 
68
        os.P_WAIT, sys.executable, quote(sys.executable),
 
69
        '-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout',
 
70
        dict(
 
71
            os.environ,
68
72
            PYTHONPATH=
69
73
            ws.find(pkg_resources.Requirement.parse('setuptools')).location
70
74
            ),