mock 1.1.2 and 1.1.3 cause build failures on several buildslaves

[daira]

The buildslaves that pick up mock 1.1.2 have this error:

SyntaxError: ('invalid syntax', ('/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/support/lib/python2.6/site-packages/mock-1.1.2-py2.6.egg/mock/tests/testwith.py', 57, 68,
"            with patch('%s.something' % __name__) as mock_something, patch('%s.something_else' % __name__) as mock_something_else:\n"))
[...]
Traceback (most recent call last):
  File "setup.py", line 460, in <module>
    **setup_args
  File "/usr/lib64/python2.6/distutils/core.py", line 152, in setup
    dist.run_commands()
  File "/usr/lib64/python2.6/distutils/dist.py", line 975, in run_commands
    self.run_command(cmd)
  File "/usr/lib64/python2.6/distutils/dist.py", line 995, in run_command
    cmd_obj.run()
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/setuptools/command/develop.py", line 23, in run
    self.old_run()
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/setuptools/command/develop.py", line 33, in old_run
    self.install_for_development()
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/setuptools/command/develop.py", line 103, in install_for_development
    self.process_distribution(None, self.dist, not self.no_deps)
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/setuptools/command/easy_install.py", line 526, in process_distribution
    [requirement], self.local_index, self.easy_install
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/pkg_resources.py", line 585, in resolve
    dist = best[req.key] = env.best_match(req, self, installer)
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/pkg_resources.py", line 843, in best_match
    return self.obtain(req, installer) # try and download/install
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/pkg_resources.py", line 855, in obtain
    return installer(requirement)
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/setuptools/command/easy_install.py", line 453, in easy_install
    return self.install_item(spec, dist.location, tmpdir, deps)
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/setuptools/command/easy_install.py", line 485, in install_item
    self.process_distribution(spec, dist, deps)
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/setuptools/command/easy_install.py", line 504, in process_distribution
    self.install_egg_scripts(dist)
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/setuptools/command/develop.py", line 128, in install_egg_scripts
    return easy_install.install_egg_scripts(self,dist)
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/setuptools/command/easy_install.py", line 385, in install_egg_scripts
    self.install_wrapper_scripts(dist)
  File "/home/buildbot/tahoe-lafs/FreeStorm_CentOS6-amd64/build/setuptools-0.6c16dev6.egg/setuptools/command/easy_install.py", line 577, in install_wrapper_scripts
    for args in get_script_args(dist, script_dir=self.script_dir):
TypeError: override_get_script_args() got an unexpected keyword argument 'script_dir'

The buildslaves that pick up mock 1.1.3 have this error:

Traceback (most recent call last):
  File "setup.py", line 460, in <module>
    **setup_args
  File "C:\Python27\lib\distutils\core.py", line 151, in setup
    dist.run_commands()
  File "C:\Python27\lib\distutils\dist.py", line 953, in run_commands
    self.run_command(cmd)
  File "C:\Python27\lib\distutils\dist.py", line 972, in run_command
    cmd_obj.run()
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\command\develop.py", line 23, in run
    self.old_run()
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\command\develop.py", line 33, in old_run
    self.install_for_development()
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\command\develop.py", line 103, in install_for_development
    self.process_distribution(None, self.dist, not self.no_deps)
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\command\easy_install.py", line 526, in process_distribution
    [requirement], self.local_index, self.easy_install
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\pkg_resources.py", line 585, in resolve
    dist = best[req.key] = env.best_match(req, self, installer)
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\pkg_resources.py", line 843, in best_match
    return self.obtain(req, installer) # try and download/install
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\pkg_resources.py", line 855, in obtain
    return installer(requirement)
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\command\easy_install.py", line 453, in easy_install
    return self.install_item(spec, dist.location, tmpdir, deps)
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\command\easy_install.py", line 483, in install_item
    dists = self.install_eggs(spec, download, tmpdir)
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\command\easy_install.py", line 663, in install_eggs
    return self.build_and_install(setup_script, setup_base)
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\command\easy_install.py", line 938, in build_and_install
    self.run_setup(setup_script, setup_base, args)
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\command\easy_install.py", line 927, in run_setup
    run_setup(setup_script, args)
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\sandbox.py", line 62, in run_setup
    lambda: execfile(
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\sandbox.py", line 105, in run
    return func()
  File "C:\Users\Buildslave\tahoe\Daira_Win7-64_py2_7\build\setuptools-0.6c16dev6.egg\setuptools\sandbox.py", line 64, in <lambda>
    {'__file__':setup_script, '__name__':'__main__'}
  File "setup.py", line 10, in <module>
    #
AttributeError: 'module' object has no attribute 'version'

I have temporarily restricted mock to <= 1.0.1 in src/allmydata/_auto_deps.py on master.

[daira]

These errors might be related to the addition of a pbr >= 1.3.0 dependency of mock.