Fix conditional dependency on libs required for SNI

sebastinas · sebastinas · commit 886e8e03baea · 2015-02-28T21:07:31.000+01:00
And replace them with requests[security]

Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/README.rst b/README.rst
@@ -18,12 +18,10 @@ Dependencies
 * watchdog (optional, for monitoring imported modules for changes)
 * jedi (optional, for experimental multiline completion)
 
-If you are using Python 2 on Mac OS X, the following dependencies are required
-as well:
+If you are using Python 2 before 2.7.7, the following dependency is also
+required:
 
-* pyOpenSSL
-* ndg-httpsclien
-* pyasn1
+* requests[security]
 
 If you have problems installing cffi which is needed by pyOpenSSL,
 please take a look at https://cffi.readthedocs.org/en/release-0.8/#macos-x.
diff --git a/setup.py b/setup.py
@@ -219,12 +219,9 @@ def initialize_options(self):
     'urwid': ['urwid'],
     'watch': ['watchdog'],
     'jedi': ['jedi'],
-    # need PyOpenSSL for SNI support (only 2.X and on Darwin)
-    # list of packages taken from
-    # https://github.com/kennethreitz/requests/blob/master/requests/packages/urllib3/contrib/pyopenssl.py
-    ':sys_platform == "darwin" and '\
-            '(python_version == "2.6" or python_version == "2.7")': [
-        'PyOpenSSL', 'ndg-httpsclient', 'pyasn1'
+    # need requests[security] for SNI support (only before 2.7.7)
+    ':python_full_version <= "2.7.7"': [
+        'requests[security]'
     ]
 }
 
