GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

clearer variable names in retrieveURL

Browse source
This commit is contained in:
Damien Elmes 2020-05-21 09:22:34 +10:00
parent 8300d8d85c
commit d5d5ca9c3d
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
qt/aqt/editor.py
View file

@ -803,39 +803,39 @@ to a cloze type first, via Edit>Change Note Type."""
local = False local = False
# fetch it into a temporary folder # fetch it into a temporary folder
self.mw.progress.start(immediate=not local, parent=self.parentWindow) self.mw.progress.start(immediate=not local, parent=self.parentWindow)
r = None response = None
ct = None content_type = None
error_msg: Optional[str] = None error_msg: Optional[str] = None
try: try:
if local: if local:
req = urllib.request.Request( req = urllib.request.Request(
url, None, {"User-Agent": "Mozilla/5.0 (compatible; Anki)"} url, None, {"User-Agent": "Mozilla/5.0 (compatible; Anki)"}
) )
with urllib.request.urlopen(req) as response: with urllib.request.urlopen(req) as resp:
filecontents = response.read() filecontents = resp.read()
else: else:
reqs = HttpClient() client = HttpClient()
reqs.timeout = 30 client.timeout = 30
r = reqs.get(url) response = client.get(url)
if r.status_code != 200: if response.status_code != 200:
error_msg = _("Unexpected response code: %s") % r.status_code error_msg = _("Unexpected response code: %s") % response.status_code
return return
filecontents = r.content filecontents = response.content
ct = r.headers.get("content-type") content_type = response.headers.get("content-type")
except (urllib.error.URLError, requests.exceptions.RequestException) as e: except (urllib.error.URLError, requests.exceptions.RequestException) as e:
error_msg = _("An error occurred while opening %s") % e error_msg = _("An error occurred while opening %s") % e
return return
finally: finally:
if r: if response:
r.close() response.close()
self.mw.progress.finish() self.mw.progress.finish()
if error_msg: if error_msg:
showWarning(error_msg) showWarning(error_msg)
# strip off any query string # strip off any query string
url = re.sub(r"\?.*?$", "", url) url = re.sub(r"\?.*?$", "", url)
fname = os.path.basename(urllib.parse.unquote(url)) fname = os.path.basename(urllib.parse.unquote(url))
if ct: if content_type:
fname = self.mw.col.media.add_extension_based_on_mime(fname, ct) fname = self.mw.col.media.add_extension_based_on_mime(fname, content_type)
return self.mw.col.media.write_data(fname, filecontents) return self.mw.col.media.write_data(fname, filecontents)