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

make 'method' argument of Extractor.request keyword-only

Browse Source
This commit is contained in:
Mike Fährmann
2019-11-05 17:28:09 +01:00
parent a5be08a830
commit de83ae4576
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gallery_dl/extractor/common.py
View File

@@ -68,7 +68,7 @@ class Extractor():
return config.interpolate( return config.interpolate(
("extractor", self.category, self.subcategory, key), default) ("extractor", self.category, self.subcategory, key), default)
def request(self, url, method="GET", *, session=None, retries=None, def request(self, url, *, method="GET", session=None, retries=None,
encoding=None, fatal=True, notfound=None, **kwargs): encoding=None, fatal=True, notfound=None, **kwargs):
tries = 1 tries = 1
retries = self._retries if retries is None else retries retries = self._retries if retries is None else retries

2
gallery_dl/extractor/imgbb.py
View File

@@ -90,7 +90,7 @@ class ImgbbExtractor(Extractor):
return return
params["seek"] = data["seekEnd"] params["seek"] = data["seekEnd"]
params["page"] += 1 params["page"] += 1
data = self.request(endpoint, "POST", data=params).json() data = self.request(endpoint, method="POST", data=params).json()
page = data["html"] page = data["html"]

5
gallery_dl/extractor/plurk.py
View File

@@ -49,7 +49,7 @@ class PlurkExtractor(Extractor):
data = {"plurk_id": plurk["id"], "count": "200"} data = {"plurk_id": plurk["id"], "count": "200"}
while True: while True:
info = self.request(url, "POST", data=data).json() info = self.request(url, method="POST", data=data).json()
yield from info["responses"] yield from info["responses"]
if not info["has_newer"]: if not info["has_newer"]:
return return
@@ -91,7 +91,8 @@ class PlurkTimelineExtractor(PlurkExtractor):
offset = datetime.datetime.strptime( offset = datetime.datetime.strptime(
plurks[-1]["posted"], "%a, %d %b %Y %H:%M:%S %Z") plurks[-1]["posted"], "%a, %d %b %Y %H:%M:%S %Z")
data["offset"] = offset.strftime("%Y-%m-%dT%H:%M:%S.000Z") data["offset"] = offset.strftime("%Y-%m-%dT%H:%M:%S.000Z")
response = self.request(url, "POST", headers=headers, data=data) response = self.request(
url, method="POST", headers=headers, data=data)
plurks = response.json()["plurks"] plurks = response.json()["plurks"]

6
gallery_dl/oauth.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2018 Mike Fährmann # Copyright 2018-2019 Mike Fährmann
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as
@@ -126,7 +126,7 @@ class OAuth1API():
self.session = extractor.session self.session = extractor.session
self.api_key = api_key self.api_key = api_key
def request(self, url, method="GET", **kwargs): def request(self, url, **kwargs):
kwargs["fatal"] = None kwargs["fatal"] = None
kwargs["session"] = self.session kwargs["session"] = self.session
return self.extractor.request(url, method, **kwargs) return self.extractor.request(url, **kwargs)