Merge branch 'refactoring-config-to-client' of https://github.com/pusher/pusher-http-python into refactoring-config-to-client

Callum Oakley · Callum Oakley · commit ff87cc13dd3c · 2016-10-19T16:17:53.000+01:00
diff --git a/pusher/__init__.py b/pusher/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from pusher.pusher import Pusher
+from .pusher import Pusher
 
 __all__ = ['Pusher']
diff --git a/setup.py b/setup.py
@@ -35,7 +35,7 @@
     install_requires=[
         'six',
         'requests>=2.3.0',
-        'urllib3',
+        'urllib3==1.17',
         'pyopenssl',
         'ndg-httpsclient',
         'pyasn1'
