diff options
| author |  jesopo | 2019-09-11 17:44:07 +0100 |
|---|---|---|
| committer | jesopo | 2019-09-11 17:44:07 +0100 |
| commit | 4a97c9eb0dc8279a7382c2fddf51f0ed93a99c1a (patch) | |
| tree | 0b453a54b928ecdc2d6268e109faf20d9d4866b1 /modules | |
| parent | automatically decode certain http content types (diff) | |
| signature | ||
refactor utils.http.requests to support a Request object
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/acronym.py | 2 | ||||
| -rw-r--r-- | modules/eval_lua.py | 3 | ||||
| -rw-r--r-- | modules/eval_rust.py | 4 | ||||
| -rw-r--r-- | modules/fediverse.py | 2 | ||||
| -rw-r--r-- | modules/title.py | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/modules/acronym.py b/modules/acronym.py index 91dbe8bc..cba92521 100644 --- a/modules/acronym.py +++ b/modules/acronym.py @@ -9,7 +9,7 @@ class Module(ModuleManager.BaseModule): @utils.kwarg("usage", "<acronym>") def acronym(self, event): query = event["args_split"][0].upper() - response = utils.http.request(API % query, soup=True) + response = utils.http.request(API % query, parse=True) if response.data: acronyms = [] for element in response.data.find_all("acro"): diff --git a/modules/eval_lua.py b/modules/eval_lua.py index d219c2e3..102aadc7 100644 --- a/modules/eval_lua.py +++ b/modules/eval_lua.py @@ -12,8 +12,7 @@ class Module(ModuleManager.BaseModule): try: page = utils.http.request(EVAL_URL, post_data={"input": event["args"]}, - method="POST", - soup=True) + method="POST", parse=True) except socket.timeout: raise utils.EventError("%s: eval timed out" % event["user"].nickname) diff --git a/modules/eval_rust.py b/modules/eval_rust.py index 3d98a622..75d51d95 100644 --- a/modules/eval_rust.py +++ b/modules/eval_rust.py @@ -32,8 +32,8 @@ class Module(ModuleManager.BaseModule): args = API_ARGS.copy() args["code"] = FN_TEMPLATE % event["args"] try: - page = utils.http.request(EVAL_URL, json_data=args, - method="POST", json=True) + page = utils.http.request(EVAL_URL, post_data=args, + method="POST", json=True, content_type="application/json") except socket.timeout: raise utils.EventError("%s: eval timed out" % event["user"].nickname) diff --git a/modules/fediverse.py b/modules/fediverse.py index 599629fc..e1080552 100644 --- a/modules/fediverse.py +++ b/modules/fediverse.py @@ -56,7 +56,7 @@ class Module(ModuleManager.BaseModule): raise utils.EventError("Please provide @<user>@<instance>") hostmeta = utils.http.request(HOSTMETA % instance, - soup=True, check_content_type=False) + parse=True, check_content_type=False) webfinger_url = None for item in hostmeta.data.find_all("link"): if item["rel"] and item["rel"][0] == "lrdd": diff --git a/modules/title.py b/modules/title.py index 9308dddc..dfaf691c 100644 --- a/modules/title.py +++ b/modules/title.py @@ -26,7 +26,7 @@ class Module(ModuleManager.BaseModule): return None try: - page = utils.http.request(url, soup=True) + page = utils.http.request(url, parse=True) except utils.http.HTTPWrongContentTypeException: return None except Exception as e: |