We are currently solving the following issue within our repository. Here is the issue text:
--- BEGIN ISSUE ---
VersionConflict: ConfigArgParse 0.9.3
Hello,

I tried renewing our certificates today, and I got an error from letsencrypt-auto. The error message was:

VersionConflict: (ConfigArgParse 0.9.3 (/home/bogdanb/.local/share/letsencrypt/lib/python2.7/site-packages), Requirement.parse('ConfigArgParse>=0.10.0'))

Please see the two attached files for the logs:
[execution.log.txt](https://github.com/letsencrypt/letsencrypt/files/97381/execution.log.txt)
[letencrypt.log.txt](https://github.com/letsencrypt/letsencrypt/files/97383/letencrypt.log.txt)

This is after I had deleted the ~/.local folder where letsencrypt stores its downloads. (I had the same exception before.) This is on an Ubuntu 15.04 machine:

$ uname -a
Linux qotilabs-dime 2.6.32-042stab112.15 #1 SMP Tue Oct 20 17:22:56 MSK 2015 x86_64 x86_64 x86_64 GNU/Linux


--- END ISSUE ---

Below are some code segments, each from a relevant file. One or more of these files may contain bugs.
--- BEGIN FILES ---
Path: `setup.py`
Content:
```
1 import codecs
2 import os
3 import re
4 import sys
5 
6 from setuptools import setup
7 from setuptools import find_packages
8 
9 # Workaround for http://bugs.python.org/issue8876, see
10 # http://bugs.python.org/issue8876#msg208792
11 # This can be removed when using Python 2.7.9 or later:
12 # https://hg.python.org/cpython/raw-file/v2.7.9/Misc/NEWS
13 if os.path.abspath(__file__).split(os.path.sep)[1] == 'vagrant':
14     del os.link
15 
16 
17 def read_file(filename, encoding='utf8'):
18     """Read unicode from given file."""
19     with codecs.open(filename, encoding=encoding) as fd:
20         return fd.read()
21 
22 
23 here = os.path.abspath(os.path.dirname(__file__))
24 
25 # read version number (and other metadata) from package init
26 init_fn = os.path.join(here, 'letsencrypt', '__init__.py')
27 meta = dict(re.findall(r"""__([a-z]+)__ = '([^']+)""", read_file(init_fn)))
28 
29 readme = read_file(os.path.join(here, 'README.rst'))
30 changes = read_file(os.path.join(here, 'CHANGES.rst'))
31 version = meta['version']
32 
33 # Please update tox.ini when modifying dependency version requirements
34 install_requires = [
35     'acme=={0}'.format(version),
36     'ConfigArgParse>=0.10.0',  # python2.6 support, upstream #17
37     'configobj',
38     'cryptography>=0.7',  # load_pem_x509_certificate
39     'parsedatetime',
40     'psutil>=2.1.0',  # net_connections introduced in 2.1.0
41     'PyOpenSSL',
42     'pyrfc3339',
43     'python2-pythondialog>=3.2.2rc1',  # Debian squeeze support, cf. #280
44     'pytz',
45     'setuptools',  # pkg_resources
46     'six',
47     'zope.component',
48     'zope.interface',
49 ]
50 
51 # env markers in extras_require cause problems with older pip: #517
52 # Keep in sync with conditional_requirements.py.
53 if sys.version_info < (2, 7):
54     install_requires.extend([
55         # only some distros recognize stdlib argparse as already satisfying
56         'argparse',
57         'mock<1.1.0',
58     ])
59 else:
60     install_requires.append('mock')
61 
62 dev_extras = [
63     # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
64     'astroid==1.3.5',
65     'pylint==1.4.2',  # upstream #248
66     'twine',
67     'wheel',
68 ]
69 
70 docs_extras = [
71     'repoze.sphinx.autointerface',
72     'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags
73     'sphinx_rtd_theme',
74     'sphinxcontrib-programoutput',
75 ]
76 
77 testing_extras = [
78     'coverage',
79     'nose',
80     'nosexcover',
81     'pep8',
82     'tox',
83 ]
84 
85 setup(
86     name='letsencrypt',
87     version=version,
88     description="Let's Encrypt client",
89     long_description=readme,  # later: + '\n\n' + changes
90     url='https://github.com/letsencrypt/letsencrypt',
91     author="Let's Encrypt Project",
92     author_email='client-dev@letsencrypt.org',
93     license='Apache License 2.0',
94     classifiers=[
95         'Development Status :: 3 - Alpha',
96         'Environment :: Console',
97         'Environment :: Console :: Curses',
98         'Intended Audience :: System Administrators',
99         'License :: OSI Approved :: Apache Software License',
100         'Operating System :: POSIX :: Linux',
101         'Programming Language :: Python',
102         'Programming Language :: Python :: 2',
103         'Programming Language :: Python :: 2.6',
104         'Programming Language :: Python :: 2.7',
105         'Topic :: Internet :: WWW/HTTP',
106         'Topic :: Security',
107         'Topic :: System :: Installation/Setup',
108         'Topic :: System :: Networking',
109         'Topic :: System :: Systems Administration',
110         'Topic :: Utilities',
111     ],
112 
113     packages=find_packages(exclude=['docs', 'examples', 'tests', 'venv']),
114     include_package_data=True,
115 
116     install_requires=install_requires,
117     extras_require={
118         'dev': dev_extras,
119         'docs': docs_extras,
120         'testing': testing_extras,
121     },
122 
123     # to test all packages run "python setup.py test -s
124     # {acme,letsencrypt_apache,letsencrypt_nginx}"
125     test_suite='letsencrypt',
126 
127     entry_points={
128         'console_scripts': [
129             'letsencrypt = letsencrypt.cli:main',
130             'letsencrypt-renewer = letsencrypt.renewer:main',
131         ],
132         'letsencrypt.plugins': [
133             'manual = letsencrypt.plugins.manual:Authenticator',
134             'null = letsencrypt.plugins.null:Installer',
135             'standalone = letsencrypt.plugins.standalone:Authenticator',
136             'webroot = letsencrypt.plugins.webroot:Authenticator',
137         ],
138     },
139 )
140
```
--- END FILES ---

Please first localize the bug based on the issue statement, and then generate a patch according to the `git diff` format fenced by three backticks.

Here is an example:

```diff
diff --git a/examples/server_async.py b/examples/server_async.py
--- a/examples/server_async.py
+++ b/examples/server_async.py
@@ -313,4 +313,4 @@
 
 
 if __name__ == "__main__":
-    asyncio.run(run_async_server("."), debug=True)
+    asyncio.run(run_async_server(), debug=True)
diff --git a/examples/server_sync.py b/examples/server_sync.py
--- a/examples/server_sync.py
+++ b/examples/server_sync.py
@@ -313,5 +313,5 @@
 
 
 if __name__ == "__main__":
-    server = run_sync_server(".")
+    server = run_sync_server()
     server.shutdown()

```

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,10 @@
 # Please update tox.ini when modifying dependency version requirements
 install_requires = [
     'acme=={0}'.format(version),
-    'ConfigArgParse>=0.10.0',  # python2.6 support, upstream #17
+    # We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but
+    # saying so here causes a runtime error against our temporary fork of 0.9.3
+    # in which we added 2.6 support (see #2243), so we relax the requirement.
+    'ConfigArgParse>=0.9.3',
     'configobj',
     'cryptography>=0.7',  # load_pem_x509_certificate
     'parsedatetime',

{"golden_diff": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -33,7 +33,10 @@\n # Please update tox.ini when modifying dependency version requirements\n install_requires = [\n     'acme=={0}'.format(version),\n-    'ConfigArgParse>=0.10.0',  # python2.6 support, upstream #17\n+    # We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but\n+    # saying so here causes a runtime error against our temporary fork of 0.9.3\n+    # in which we added 2.6 support (see #2243), so we relax the requirement.\n+    'ConfigArgParse>=0.9.3',\n     'configobj',\n     'cryptography>=0.7',  # load_pem_x509_certificate\n     'parsedatetime',\n", "issue": "VersionConflict: ConfigArgParse 0.9.3\nHello,\n\nI tried renewing our certificates today, and I got an error from letsencrypt-auto. The error message was:\n\nVersionConflict: (ConfigArgParse 0.9.3 (/home/bogdanb/.local/share/letsencrypt/lib/python2.7/site-packages), Requirement.parse('ConfigArgParse>=0.10.0'))\n\nPlease see the two attached files for the logs:\n[execution.log.txt](https://github.com/letsencrypt/letsencrypt/files/97381/execution.log.txt)\n[letencrypt.log.txt](https://github.com/letsencrypt/letsencrypt/files/97383/letencrypt.log.txt)\n\nThis is after I had deleted the ~/.local folder where letsencrypt stores its downloads. (I had the same exception before.) This is on an Ubuntu 15.04 machine:\n\n$ uname -a\nLinux qotilabs-dime 2.6.32-042stab112.15 #1 SMP Tue Oct 20 17:22:56 MSK 2015 x86_64 x86_64 x86_64 GNU/Linux\n\n", "before_files": [{"content": "import codecs\nimport os\nimport re\nimport sys\n\nfrom setuptools import setup\nfrom setuptools import find_packages\n\n# Workaround for http://bugs.python.org/issue8876, see\n# http://bugs.python.org/issue8876#msg208792\n# This can be removed when using Python 2.7.9 or later:\n# https://hg.python.org/cpython/raw-file/v2.7.9/Misc/NEWS\nif os.path.abspath(__file__).split(os.path.sep)[1] == 'vagrant':\n    del os.link\n\n\ndef read_file(filename, encoding='utf8'):\n    \"\"\"Read unicode from given file.\"\"\"\n    with codecs.open(filename, encoding=encoding) as fd:\n        return fd.read()\n\n\nhere = os.path.abspath(os.path.dirname(__file__))\n\n# read version number (and other metadata) from package init\ninit_fn = os.path.join(here, 'letsencrypt', '__init__.py')\nmeta = dict(re.findall(r\"\"\"__([a-z]+)__ = '([^']+)\"\"\", read_file(init_fn)))\n\nreadme = read_file(os.path.join(here, 'README.rst'))\nchanges = read_file(os.path.join(here, 'CHANGES.rst'))\nversion = meta['version']\n\n# Please update tox.ini when modifying dependency version requirements\ninstall_requires = [\n    'acme=={0}'.format(version),\n    'ConfigArgParse>=0.10.0',  # python2.6 support, upstream #17\n    'configobj',\n    'cryptography>=0.7',  # load_pem_x509_certificate\n    'parsedatetime',\n    'psutil>=2.1.0',  # net_connections introduced in 2.1.0\n    'PyOpenSSL',\n    'pyrfc3339',\n    'python2-pythondialog>=3.2.2rc1',  # Debian squeeze support, cf. #280\n    'pytz',\n    'setuptools',  # pkg_resources\n    'six',\n    'zope.component',\n    'zope.interface',\n]\n\n# env markers in extras_require cause problems with older pip: #517\n# Keep in sync with conditional_requirements.py.\nif sys.version_info < (2, 7):\n    install_requires.extend([\n        # only some distros recognize stdlib argparse as already satisfying\n        'argparse',\n        'mock<1.1.0',\n    ])\nelse:\n    install_requires.append('mock')\n\ndev_extras = [\n    # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289\n    'astroid==1.3.5',\n    'pylint==1.4.2',  # upstream #248\n    'twine',\n    'wheel',\n]\n\ndocs_extras = [\n    'repoze.sphinx.autointerface',\n    'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags\n    'sphinx_rtd_theme',\n    'sphinxcontrib-programoutput',\n]\n\ntesting_extras = [\n    'coverage',\n    'nose',\n    'nosexcover',\n    'pep8',\n    'tox',\n]\n\nsetup(\n    name='letsencrypt',\n    version=version,\n    description=\"Let's Encrypt client\",\n    long_description=readme,  # later: + '\\n\\n' + changes\n    url='https://github.com/letsencrypt/letsencrypt',\n    author=\"Let's Encrypt Project\",\n    author_email='client-dev@letsencrypt.org',\n    license='Apache License 2.0',\n    classifiers=[\n        'Development Status :: 3 - Alpha',\n        'Environment :: Console',\n        'Environment :: Console :: Curses',\n        'Intended Audience :: System Administrators',\n        'License :: OSI Approved :: Apache Software License',\n        'Operating System :: POSIX :: Linux',\n        'Programming Language :: Python',\n        'Programming Language :: Python :: 2',\n        'Programming Language :: Python :: 2.6',\n        'Programming Language :: Python :: 2.7',\n        'Topic :: Internet :: WWW/HTTP',\n        'Topic :: Security',\n        'Topic :: System :: Installation/Setup',\n        'Topic :: System :: Networking',\n        'Topic :: System :: Systems Administration',\n        'Topic :: Utilities',\n    ],\n\n    packages=find_packages(exclude=['docs', 'examples', 'tests', 'venv']),\n    include_package_data=True,\n\n    install_requires=install_requires,\n    extras_require={\n        'dev': dev_extras,\n        'docs': docs_extras,\n        'testing': testing_extras,\n    },\n\n    # to test all packages run \"python setup.py test -s\n    # {acme,letsencrypt_apache,letsencrypt_nginx}\"\n    test_suite='letsencrypt',\n\n    entry_points={\n        'console_scripts': [\n            'letsencrypt = letsencrypt.cli:main',\n            'letsencrypt-renewer = letsencrypt.renewer:main',\n        ],\n        'letsencrypt.plugins': [\n            'manual = letsencrypt.plugins.manual:Authenticator',\n            'null = letsencrypt.plugins.null:Installer',\n            'standalone = letsencrypt.plugins.standalone:Authenticator',\n            'webroot = letsencrypt.plugins.webroot:Authenticator',\n        ],\n    },\n)\n", "path": "setup.py"}], "after_files": [{"content": "import codecs\nimport os\nimport re\nimport sys\n\nfrom setuptools import setup\nfrom setuptools import find_packages\n\n# Workaround for http://bugs.python.org/issue8876, see\n# http://bugs.python.org/issue8876#msg208792\n# This can be removed when using Python 2.7.9 or later:\n# https://hg.python.org/cpython/raw-file/v2.7.9/Misc/NEWS\nif os.path.abspath(__file__).split(os.path.sep)[1] == 'vagrant':\n    del os.link\n\n\ndef read_file(filename, encoding='utf8'):\n    \"\"\"Read unicode from given file.\"\"\"\n    with codecs.open(filename, encoding=encoding) as fd:\n        return fd.read()\n\n\nhere = os.path.abspath(os.path.dirname(__file__))\n\n# read version number (and other metadata) from package init\ninit_fn = os.path.join(here, 'letsencrypt', '__init__.py')\nmeta = dict(re.findall(r\"\"\"__([a-z]+)__ = '([^']+)\"\"\", read_file(init_fn)))\n\nreadme = read_file(os.path.join(here, 'README.rst'))\nchanges = read_file(os.path.join(here, 'CHANGES.rst'))\nversion = meta['version']\n\n# Please update tox.ini when modifying dependency version requirements\ninstall_requires = [\n    'acme=={0}'.format(version),\n    # We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but\n    # saying so here causes a runtime error against our temporary fork of 0.9.3\n    # in which we added 2.6 support (see #2243), so we relax the requirement.\n    'ConfigArgParse>=0.9.3',\n    'configobj',\n    'cryptography>=0.7',  # load_pem_x509_certificate\n    'parsedatetime',\n    'psutil>=2.1.0',  # net_connections introduced in 2.1.0\n    'PyOpenSSL',\n    'pyrfc3339',\n    'python2-pythondialog>=3.2.2rc1',  # Debian squeeze support, cf. #280\n    'pytz',\n    'setuptools',  # pkg_resources\n    'six',\n    'zope.component',\n    'zope.interface',\n]\n\n# env markers in extras_require cause problems with older pip: #517\nif sys.version_info < (2, 7):\n    install_requires.extend([\n        # only some distros recognize stdlib argparse as already satisfying\n        'argparse',\n        'mock<1.1.0',\n    ])\nelse:\n    install_requires.extend([\n        'mock',\n    ])\n\ndev_extras = [\n    # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289\n    'astroid==1.3.5',\n    'pylint==1.4.2',  # upstream #248\n    'twine',\n    'wheel',\n]\n\ndocs_extras = [\n    'repoze.sphinx.autointerface',\n    'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags\n    'sphinx_rtd_theme',\n    'sphinxcontrib-programoutput',\n]\n\ntesting_extras = [\n    'coverage',\n    'nose',\n    'nosexcover',\n    'pep8',\n    'tox',\n]\n\nsetup(\n    name='letsencrypt',\n    version=version,\n    description=\"Let's Encrypt client\",\n    long_description=readme,  # later: + '\\n\\n' + changes\n    url='https://github.com/letsencrypt/letsencrypt',\n    author=\"Let's Encrypt Project\",\n    author_email='client-dev@letsencrypt.org',\n    license='Apache License 2.0',\n    classifiers=[\n        'Development Status :: 3 - Alpha',\n        'Environment :: Console',\n        'Environment :: Console :: Curses',\n        'Intended Audience :: System Administrators',\n        'License :: OSI Approved :: Apache Software License',\n        'Operating System :: POSIX :: Linux',\n        'Programming Language :: Python',\n        'Programming Language :: Python :: 2',\n        'Programming Language :: Python :: 2.6',\n        'Programming Language :: Python :: 2.7',\n        'Topic :: Internet :: WWW/HTTP',\n        'Topic :: Security',\n        'Topic :: System :: Installation/Setup',\n        'Topic :: System :: Networking',\n        'Topic :: System :: Systems Administration',\n        'Topic :: Utilities',\n    ],\n\n    packages=find_packages(exclude=['docs', 'examples', 'tests', 'venv']),\n    include_package_data=True,\n\n    install_requires=install_requires,\n    extras_require={\n        'dev': dev_extras,\n        'docs': docs_extras,\n        'testing': testing_extras,\n    },\n\n    tests_require=install_requires,\n    # to test all packages run \"python setup.py test -s\n    # {acme,letsencrypt_apache,letsencrypt_nginx}\"\n    test_suite='letsencrypt',\n\n    entry_points={\n        'console_scripts': [\n            'letsencrypt = letsencrypt.cli:main',\n            'letsencrypt-renewer = letsencrypt.renewer:main',\n        ],\n        'letsencrypt.plugins': [\n            'manual = letsencrypt.plugins.manual:Authenticator',\n            'null = letsencrypt.plugins.null:Installer',\n            'standalone = letsencrypt.plugins.standalone:Authenticator',\n            'webroot = letsencrypt.plugins.webroot:Authenticator',\n        ],\n    },\n)\n", "path": "setup.py"}]}