github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4-dev

Browse Source
This commit is contained in:
Mike Fährmann
2018-05-04 10:17:57 +02:00
parent 8bf3cdd82b 82c50fa609
commit 69a5e6ddb3
17 changed files with 402 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gallery_dl/util.py
View File

@@ -510,11 +510,11 @@ class OAuthSession():
self.params["oauth_signature_method"] = "HMAC-SHA1"
self.params["oauth_version"] = "1.0"
def get(self, url, params):
def get(self, url, params, **kwargs):
params.update(self.params)
params["oauth_nonce"] = self.nonce(16)
params["oauth_timestamp"] = int(time.time())
return self.session.get(url + self.sign(url, params))
return self.session.get(url + self.sign(url, params), **kwargs)
def sign(self, url, params):
"""Generate 'oauth_signature' value and return query string"""