Skip to content

Add support for loading proxy config from the environment #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 25, 2019
Merged

Add support for loading proxy config from the environment #25

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4802946
Add support for loading proxy config from the environment
jonathanlloyd Nov 19, 2019
92e664b
Add comment explaining new flag
jonathanlloyd Nov 19, 2019
9f2061a
Add test to check proxy env vars still works
jonathanlloyd Nov 20, 2019
efb7702
Remove flag for proxy support (makes this a breaking change)
jonathanlloyd Nov 25, 2019
879c9b6
Update changelog
jonathanlloyd Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions pusher_push_notifications/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import copy
import datetime
import json
import os
import re
import time
import warnings
Expand Down Expand Up @@ -76,6 +77,13 @@ def _make_url(scheme, host, path):
])


def _get_proxies_from_env():
return {
'http': os.environ.get('HTTP_PROXY') or os.environ.get('http_proxy'),
Copy link
Contributor

@luismfonseca luismfonseca Nov 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's case sensitive? :o

'https': os.environ.get('HTTPS_PROXY') or os.environ.get('https_proxy'),
}


class PushNotifications(object):
"""Pusher Push Notifications API client
This client class can be used to publish notifications to the Pusher
Expand Down Expand Up @@ -117,6 +125,14 @@ def _make_request(self, method, path, path_params, body=None):
url = _make_url(scheme='https', host=self.endpoint, path=path)

session = requests.Session()
# We've had multiple support requests about this library not working
# 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 reintroduces the proxy support that is the default in requests
# anyway.
session.proxies = _get_proxies_from_env()

request = requests.Request(
method,
url,
Expand Down