From a74eff5fbd4f68a584bff9d2805f28954d95f978 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Fri, 28 Aug 2015 06:40:19 +0000
Subject: [PATCH] Revert "Revert PR #708."

This reverts commit 70e311b43f6910c070dce3bab3396db495636d00.
---
 acme/setup.py                           | 10 +++++++---
 letsencrypt-apache/setup.py             |  8 +++++++-
 letsencrypt-compatibility-test/setup.py |  8 +++++++-
 letsencrypt-nginx/setup.py              |  8 +++++++-
 letshelp-letsencrypt/setup.py           |  8 ++++----
 setup.py                                | 10 +++++++---
 6 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/acme/setup.py b/acme/setup.py
index 6d8208414..5f1da2391 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -9,7 +9,6 @@ install_requires = [
     # load_pem_private/public_key (>=0.6)
     # rsa_recover_prime_factors (>=0.8)
     'cryptography>=0.8',
-    'mock<1.1.0',  # py26
     'pyrfc3339',
     'ndg-httpsclient',  # urllib3 InsecurePlatformWarning (#304)
     'pyasn1',  # urllib3 InsecurePlatformWarning (#304)
@@ -23,8 +22,13 @@ install_requires = [
 
 # env markers in extras_require cause problems with older pip: #517
 if sys.version_info < (2, 7):
-    # only some distros recognize stdlib argparse as already satisfying
-    install_requires.append('argparse')
+    install_requires.extend([
+        # only some distros recognize stdlib argparse as already satisfying
+        'argparse',
+        'mock<1.1.0',
+    ])
+else:
+    install_requires.append('mock')
 
 testing_extras = [
     'nose',
diff --git a/letsencrypt-apache/setup.py b/letsencrypt-apache/setup.py
index 39f4b68e1..5f1b0a95d 100644
--- a/letsencrypt-apache/setup.py
+++ b/letsencrypt-apache/setup.py
@@ -1,3 +1,5 @@
+import sys
+
 from setuptools import setup
 from setuptools import find_packages
 
@@ -5,12 +7,16 @@ from setuptools import find_packages
 install_requires = [
     'acme',
     'letsencrypt',
-    'mock<1.1.0',  # py26
     'python-augeas',
     'zope.component',
     'zope.interface',
 ]
 
+if sys.version_info < (2, 7):
+    install_requires.append('mock<1.1.0')
+else:
+    install_requires.append('mock')
+
 setup(
     name='letsencrypt-apache',
     packages=find_packages(),
diff --git a/letsencrypt-compatibility-test/setup.py b/letsencrypt-compatibility-test/setup.py
index f02041e55..99e66f54f 100644
--- a/letsencrypt-compatibility-test/setup.py
+++ b/letsencrypt-compatibility-test/setup.py
@@ -1,3 +1,5 @@
+import sys
+
 from setuptools import setup
 from setuptools import find_packages
 
@@ -7,10 +9,14 @@ install_requires = [
     'letsencrypt-apache',
     'letsencrypt-nginx',
     'docker-py',
-    'mock<1.1.0',  # py26
     'zope.interface',
 ]
 
+if sys.version_info < (2, 7):
+    install_requires.append('mock<1.1.0')
+else:
+    install_requires.append('mock')
+
 setup(
     name='letsencrypt-compatibility-test',
     packages=find_packages(),
diff --git a/letsencrypt-nginx/setup.py b/letsencrypt-nginx/setup.py
index 92b974974..64742e7b6 100644
--- a/letsencrypt-nginx/setup.py
+++ b/letsencrypt-nginx/setup.py
@@ -1,3 +1,5 @@
+import sys
+
 from setuptools import setup
 from setuptools import find_packages
 
@@ -6,10 +8,14 @@ install_requires = [
     'acme',
     'letsencrypt',
     'pyparsing>=1.5.5',  # Python3 support; perhaps unnecessary?
-    'mock<1.1.0',  # py26
     'zope.interface',
 ]
 
+if sys.version_info < (2, 7):
+    install_requires.append('mock<1.1.0')
+else:
+    install_requires.append('mock')
+
 setup(
     name='letsencrypt-nginx',
     packages=find_packages(),
diff --git a/letshelp-letsencrypt/setup.py b/letshelp-letsencrypt/setup.py
index 6b89a6d09..7d42af88b 100644
--- a/letshelp-letsencrypt/setup.py
+++ b/letshelp-letsencrypt/setup.py
@@ -6,17 +6,17 @@ from setuptools import find_packages
 
 install_requires = []
 if sys.version_info < (2, 7):
-    install_requires.append("mock<1.1.0")
+    install_requires.append('mock<1.1.0')
 else:
-    install_requires.append("mock")
+    install_requires.append('mock')
 
 setup(
-    name="letshelp-letsencrypt",
+    name='letshelp-letsencrypt',
     packages=find_packages(),
     install_requires=install_requires,
     entry_points={
         'console_scripts': [
-            "letshelp-letsencrypt-apache = letshelp_letsencrypt.apache:main",
+            'letshelp-letsencrypt-apache = letshelp_letsencrypt.apache:main',
         ],
     },
     include_package_data=True,
diff --git a/setup.py b/setup.py
index f816c6c56..e15ade595 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,6 @@ install_requires = [
     'ConfigArgParse',
     'configobj',
     'cryptography>=0.7',  # load_pem_x509_certificate
-    'mock<1.1.0',  # py26
     'parsedatetime',
     'psutil>=2.1.0',  # net_connections introduced in 2.1.0
     'PyOpenSSL',
@@ -47,8 +46,13 @@ install_requires = [
 
 # env markers in extras_require cause problems with older pip: #517
 if sys.version_info < (2, 7):
-    # only some distros recognize stdlib argparse as already satisfying
-    install_requires.append('argparse')
+    install_requires.extend([
+        # only some distros recognize stdlib argparse as already satisfying
+        'argparse',
+        'mock<1.1.0',
+    ])
+else:
+    install_requires.append('mock')
 
 dev_extras = [
     # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289