Skip to content

Commit

Permalink
Downgrade urlib3 to v1.24 to fix issues with python 3.x.
Browse files Browse the repository at this point in the history
  • Loading branch information
jwalter1-quest committed Jun 2, 2021
1 parent fdfac13 commit aac7582
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 12 deletions.
17 changes: 11 additions & 6 deletions request.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
import requests
from requests.exceptions import HTTPError

#from requests_toolbelt.utils import dump
#def print_raw_http(response):
# data = dump.dump_all(response, request_prefix=b'', response_prefix=b'')
# print('\n' * 2 + data.decode('utf-8'))

class Request(object):
"""HTTP helper class"""

Expand All @@ -36,7 +41,7 @@ def _request(self, url, method='GET', params={}, headers={}, stream=False, raw=F
r = self.session.post(url, json=params, headers=headers)
r.raise_for_status()
elif method == 'OPTIONS':
r = self.session.options(url, json=params, headers=headers)
r = self.session.options(url, headers=headers)
r.raise_for_status()
return

Expand All @@ -52,13 +57,13 @@ def _request(self, url, method='GET', params={}, headers={}, stream=False, raw=F
raise HTTPError('Request ({0} {1}) failed: {2}'.format(method, url, r.json()), response=r)

def get(self, url, params={}, headers={}, stream=False, raw=False):
return self._request(url, 'GET', params, headers, stream, raw)
return self._request(url, 'GET', params=params, headers=headers, stream=stream, raw=raw)

def put(self, url, params={}, headers={}, raw=False):
return self._request(url, 'PUT', params, headers, raw)
return self._request(url, 'PUT', params=params, headers=headers, raw=raw)

def post(self, url, params={}, headers={}, raw=False):
return self._request(url, 'POST', params, headers, raw)
return self._request(url, 'POST', params=params, headers=headers, raw=raw)

def options(self, url, params={}, headers={}, raw=False):
return self._request(url, 'OPTIONS', params, headers, raw)
def options(self, url, headers={}, raw=False):
return self._request(url, 'OPTIONS', headers=headers, raw=raw)
23 changes: 18 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,25 @@
#
# pip-compile
#
certifi==2019.9.11 # via requests
chardet==3.0.4 # via requests
idna==2.8 # via requests
certifi==2019.9.11
# via requests
chardet==3.0.4
# via requests
idna==2.8
# via requests
monotonic==1.5
# via arlo (setup.py)
pysocks==1.7.1
# via arlo (setup.py)
requests==2.25.1
six==1.12.0 # via sseclient
# via
# arlo (setup.py)
# sseclient
six==1.13.0
# via sseclient
sseclient==0.0.22
urllib3==1.25.6 # via requests
# via arlo (setup.py)
urllib3==1.24
# via
# arlo (setup.py)
# requests
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def readme():
url='https://github.com/jeffreydwalter/arlo',
license='Apache Software License',
include_package_data=True,
install_requires=['monotonic', 'requests', 'sseclient==0.0.22', 'PySocks'],
install_requires=['monotonic', 'requests', 'urllib3==1.24', 'sseclient==0.0.22', 'PySocks'],
keywords=[
'arlo',
'camera',
Expand Down

0 comments on commit aac7582

Please sign in to comment.