diff --git a/IMDb/plugin.py b/IMDb/plugin.py index 2abcf8c..4091e01 100644 --- a/IMDb/plugin.py +++ b/IMDb/plugin.py @@ -36,8 +36,6 @@ import supybot.ircutils as ircutils import supybot.ircmsgs as ircmsgs import supybot.callbacks as callbacks import requests -import json -import re from fake_useragent import UserAgent from bs4 import BeautifulSoup from urllib.parse import urljoin, urlparse @@ -85,16 +83,14 @@ class IMDb(callbacks.Plugin): channel = msg.args[0] result = None - ua = UserAgent() - headers = {'User-Agent':str(ua.random)} self.log.info("IMDb: requesting %s" % omdb_url) try: - request = requests.get(omdb_url, timeout=10, headers=headers) + request = requests.get(omdb_url, timeout=10) if request.status_code == requests.codes.ok: - response = json.loads(request.text) + response = request.json() not_found = "Error" in response unknown_error = response["Response"] != "True" diff --git a/YouTube/plugin.py b/YouTube/plugin.py index fd209ef..774de03 100644 --- a/YouTube/plugin.py +++ b/YouTube/plugin.py @@ -38,7 +38,6 @@ import supybot.callbacks as callbacks import supybot.log as log import requests import pendulum -import json import re from jinja2 import Template from fake_useragent import UserAgent @@ -172,8 +171,6 @@ class YouTube(callbacks.Plugin): channel = msg.args[0] result = None - ua = UserAgent() - headers = {'User-Agent':str(ua.random)} yt_template = Template(self.registryValue("template", dynamic.channel)) title = "" @@ -191,11 +188,11 @@ class YouTube(callbacks.Plugin): log.debug("YouTube: requesting %s" % (api_url)) - request = requests.get(api_url, headers=headers) + request = requests.get(api_url) ok = request.status_code == requests.codes.ok if ok: - response = json.loads(request.text) + response = request.json() if response: try: