Remove flag for proxy support (makes this a breaking change)

Author: jonathanlloyd

pusher_push_notifications/__init__.py

@@ -89,8 +89,7 @@ class PushNotifications(object):
     This client class can be used to publish notifications to the Pusher
     Push Notifications service"""
 
-    def __init__(self, instance_id, secret_key,
-                 endpoint=None, use_proxy_env_vars=False):
+    def __init__(self, instance_id, secret_key, endpoint=None):
         if not isinstance(instance_id, six.string_types):
             raise TypeError('instance_id must be a string')
         if instance_id == '':
@@ -108,7 +107,6 @@ def __init__(self, instance_id, secret_key,
         self.instance_id = instance_id
         self.secret_key = secret_key
         self._endpoint = endpoint
-        self._use_proxy_env_vars = use_proxy_env_vars
 
     @property
     def endpoint(self):
@@ -131,9 +129,9 @@ def _make_request(self, method, path, path_params, body=None):
         # on PythonAnywhere (a popular python deployment platform)
         # They require that proxy servers be loaded from the environment when
         # making requests (on their free plan).
-        # This flag enables this behaviour.
-        if self._use_proxy_env_vars:
-            session.proxies = _get_proxies_from_env()
+        # This reintroduces the proxy support that is the default in requests
+        # anyway.
+        session.proxies = _get_proxies_from_env()
 
         request = requests.Request(
             method,

tests/test_interests.py

@@ -83,74 +83,6 @@ def test_publish_to_interests_should_make_correct_http_request(self):
             },
         )
 
-    def test_enabling_proxies_should_not_fail(self):
-        pn_client = PushNotifications(
-            'INSTANCE_ID',
-            'SECRET_KEY',
-            use_proxy_env_vars=True,
-        )
-        with requests_mock.Mocker() as http_mock:
-            http_mock.register_uri(
-                requests_mock.ANY,
-                requests_mock.ANY,
-                status_code=200,
-                json={
-                    'publishId': '1234',
-                },
-            )
-            response = pn_client.publish_to_interests(
-                interests=['donuts'],
-                publish_body={
-                    'apns': {
-                        'aps': {
-                            'alert': 'Hello World!',
-                        },
-                    },
-                },
-            )
-            req = http_mock.request_history[0]
-
-        method = req.method
-        path = req.path
-        headers = dict(req._request.headers.lower_items())
-        body = req.json()
-
-        self.assertEqual(
-            method,
-            'POST',
-        )
-        self.assertEqual(
-            path,
-            '/publish_api/v1/instances/instance_id/publishes/interests',
-        )
-        self.assertDictEqual(
-            headers,
-            {
-                'content-type': 'application/json',
-                'content-length': '69',
-                'authorization': 'Bearer SECRET_KEY',
-                'x-pusher-library': 'pusher-push-notifications-python 1.1.0',
-                'host': 'instance_id.pushnotifications.pusher.com',
-            },
-        )
-        self.assertDictEqual(
-            body,
-            {
-                'interests': ['donuts'],
-                'apns': {
-                    'aps': {
-                        'alert': 'Hello World!',
-                    },
-                },
-            },
-        )
-        self.assertDictEqual(
-            response,
-            {
-                'publishId': '1234',
-            },
-        )
-
     def test_deprecated_alias_still_works(self):
         pn_client = PushNotifications(
             'INSTANCE_ID',