Skip to content

feat: support for forward proxies. Fixes #41 #42

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

Open
vhartikainen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: support for forward proxies. Fixes #41 #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions pysendpulse/pysendpulse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ class PySendPulse:
__storage_type = "FILE"
__refresh_token = 0
__memcached_host = "127.0.0.1:11211"
__proxies = None

MEMCACHED_VALUE_TIMEOUT = 3600
ALLOWED_STORAGE_TYPES = ['FILE', 'MEMCACHED']

def __init__(self, user_id, secret, storage_type="FILE", token_file_path="", memcached_host="127.0.0.1:11211"):
def __init__(self, user_id, secret, storage_type="FILE", token_file_path="", memcached_host="127.0.0.1:11211", proxies=None):
""" SendPulse API constructor

@param user_id: string REST API ID from SendPulse settings
Expand All @@ -65,6 +66,7 @@ def __init__(self, user_id, secret, storage_type="FILE", token_file_path="", mem
self.__storage_type = storage_type.upper()
self.__token_file_path = token_file_path
self.__memcached_host = memcached_host
self.__proxies = proxies
m = md5()
m.update("{}::{}".format(user_id, secret).encode('utf-8'))
self.__token_hash_name = m.hexdigest()
Expand Down Expand Up @@ -148,13 +150,13 @@ def __send_request(self, path, method="GET", params=None, use_token=True, use_js
params = json.dumps(params)

if method == "POST":
response = requests.post(url, headers=headers, data=params)
response = requests.post(url, headers=headers, data=params, proxies=self.__proxies)
elif method == "PUT":
response = requests.put(url, headers=headers, data=params)
response = requests.put(url, headers=headers, data=params, proxies=self.__proxies)
elif method == "DELETE":
response = requests.delete(url, headers=headers, data=params)
response = requests.delete(url, headers=headers, data=params, proxies=self.__proxies)
else:
response = requests.get(url, headers=headers, params=params)
response = requests.get(url, headers=headers, params=params, proxies=self.__proxies)
if response.status_code == 401 and self.__refresh_token == 0:
self.__get_token()
return self.__send_request(path, method, params)
Expand Down