make 'method' argument of Extractor.request keyword-only
This commit is contained in:
@@ -68,7 +68,7 @@ class Extractor():
|
||||
return config.interpolate(
|
||||
("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):
|
||||
tries = 1
|
||||
retries = self._retries if retries is None else retries
|
||||
|
||||
@@ -90,7 +90,7 @@ class ImgbbExtractor(Extractor):
|
||||
return
|
||||
params["seek"] = data["seekEnd"]
|
||||
params["page"] += 1
|
||||
data = self.request(endpoint, "POST", data=params).json()
|
||||
data = self.request(endpoint, method="POST", data=params).json()
|
||||
page = data["html"]
|
||||
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ class PlurkExtractor(Extractor):
|
||||
data = {"plurk_id": plurk["id"], "count": "200"}
|
||||
|
||||
while True:
|
||||
info = self.request(url, "POST", data=data).json()
|
||||
info = self.request(url, method="POST", data=data).json()
|
||||
yield from info["responses"]
|
||||
if not info["has_newer"]:
|
||||
return
|
||||
@@ -91,7 +91,8 @@ class PlurkTimelineExtractor(PlurkExtractor):
|
||||
offset = datetime.datetime.strptime(
|
||||
plurks[-1]["posted"], "%a, %d %b %Y %H:%M:%S %Z")
|
||||
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"]
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# -*- 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
|
||||
# it under the terms of the GNU General Public License version 2 as
|
||||
@@ -126,7 +126,7 @@ class OAuth1API():
|
||||
self.session = extractor.session
|
||||
self.api_key = api_key
|
||||
|
||||
def request(self, url, method="GET", **kwargs):
|
||||
def request(self, url, **kwargs):
|
||||
kwargs["fatal"] = None
|
||||
kwargs["session"] = self.session
|
||||
return self.extractor.request(url, method, **kwargs)
|
||||
return self.extractor.request(url, **kwargs)
|
||||
|
||||
Reference in New Issue
Block a user