dmoonfire/dosage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Remove support for very old versions of "requests".

Browse source
This commit is contained in:
Tobias Gruetzmacher 2015-11-02 23:24:01 +01:00
parent bc84001ffd
commit 10d9eac574
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dosagelib/util.py
View file

@ -55,11 +55,6 @@ ConnectionTimeoutSecs = 60
UrlEncoding = "utf-8" UrlEncoding = "utf-8"
if hasattr(requests, 'adapters'):
# requests >= 1.0
requests.adapters.DEFAULT_RETRIES = MaxRetries
def get_system_uid(): def get_system_uid():
"""Get a (probably) unique ID to identify a system. """Get a (probably) unique ID to identify a system.
Used to differentiate votes. Used to differentiate votes.
@ -305,22 +300,16 @@ def urlopen(url, session, referrer=None, max_content_bytes=None,
kwargs = { kwargs = {
"headers": headers, "headers": headers,
"timeout": timeout, "timeout": timeout,
"stream": stream,
} }
if hasattr(requests, 'adapters'):
# requests >= 1.0
kwargs["stream"] = stream
else:
# requests << 1.0
kwargs["prefetch"] = not stream
kwargs["config"] = {"max_retries": MaxRetries}
if data is None: if data is None:
func = session.get method = 'GET'
else: else:
kwargs['data'] = data kwargs['data'] = data
func = session.post method = 'POST'
out.debug(u'Sending POST data %s' % data, level=3) out.debug(u'Sending POST data %s' % data, level=3)
try: try:
req = func(url, **kwargs) req = session.request(method, url, **kwargs)
out.debug(u'Response cookies: %s' % req.cookies) out.debug(u'Response cookies: %s' % req.cookies)
check_content_size(url, req.headers, max_content_bytes) check_content_size(url, req.headers, max_content_bytes)
if raise_for_status: if raise_for_status:

2
requirements.txt
View file

@ -1,5 +1,5 @@
# required: # required:
requests requests>=2.0
# optional: # optional:
argcomplete argcomplete
lxml lxml