Merge branch 'development' into add_proxy_support

Author: fredthomsen

HISTORY.rst

@@ -82,7 +82,7 @@ dev
     simple ``.headers`` and ``.trailers`` properties that contain
     ``HTTPHeaderMap`` structures.
   - Headers and trailers are now bytestrings, rather than unicode strings.
-  - An ``iter_chunked()`` method was added to repsonse objects that allows
+  - An ``iter_chunked()`` method was added to response objects that allows
     iterating over data in units of individual data frames.
   - Changed the name of ``getresponse()`` to ``get_response()``, because
     ``getresponse()`` was a terrible name forced upon me by httplib.

setup.py

@@ -29,11 +29,23 @@
 py_version = sys.version_info[:2]
 py_long_version = sys.version_info[:3]
 
+try:
+    pypy_version = sys.pypy_version_info[:2]
+except AttributeError:
+    pypy_version = None
+
+
 def resolve_install_requires():
-    if py_version == (3,3):
-        return ['pyOpenSSL>=0.15', 'service_identity>=14.0.0']
-    elif py_version == (2,7) and py_long_version < (2,7,9):
+    if py_version == (3, 3):
         return ['pyOpenSSL>=0.15', 'service_identity>=14.0.0']
+    elif py_version == (2, 7) and py_long_version < (2, 7, 9):
+        deps = ['pyOpenSSL>=0.15', 'service_identity>=14.0.0']
+
+        # PyPy earlier than 2.6.0 doesn't support cryptography 1.0
+        if pypy_version and pypy_version < (2, 6):
+            deps.append('cryptography<1.0')
+
+        return deps
     return []
 
 packages = [