aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--python/fatcat_tools/harvest/doi_registrars.py2
-rw-r--r--python/fatcat_tools/importers/common.py2
-rw-r--r--python/fatcat_tools/transforms/csl.py2
-rw-r--r--python/fatcat_web/auth.py2
-rw-r--r--python/fatcat_web/routes.py2
5 files changed, 4 insertions, 6 deletions
diff --git a/python/fatcat_tools/harvest/doi_registrars.py b/python/fatcat_tools/harvest/doi_registrars.py
index 03773c15..553f4e7a 100644
--- a/python/fatcat_tools/harvest/doi_registrars.py
+++ b/python/fatcat_tools/harvest/doi_registrars.py
@@ -143,7 +143,7 @@ class HarvestCrossrefWorker:
# Datacite API returned HTTP 200, but JSON seemed unparseable.
# It might be a glitch, so we retry.
print("failed to decode body from {}: {}".format(http_resp.url, resp_body), file=sys.stderr)
- raise
+ raise exc
items = self.extract_items(resp)
count += len(items)
print("... got {} ({} of {}), HTTP fetch took {}".format(len(items), count,
diff --git a/python/fatcat_tools/importers/common.py b/python/fatcat_tools/importers/common.py
index fcbe9ad2..6815a155 100644
--- a/python/fatcat_tools/importers/common.py
+++ b/python/fatcat_tools/importers/common.py
@@ -8,9 +8,7 @@ import datetime
import subprocess
from collections import Counter
from typing import Optional, Tuple
-from confluent_kafka import Consumer, KafkaException
import lxml
-import xml.parsers.expat
import xml.etree.ElementTree as ET
import elasticsearch
diff --git a/python/fatcat_tools/transforms/csl.py b/python/fatcat_tools/transforms/csl.py
index 15bb369f..0556f4fe 100644
--- a/python/fatcat_tools/transforms/csl.py
+++ b/python/fatcat_tools/transforms/csl.py
@@ -33,7 +33,7 @@ def release_to_csl(entity):
if contrib.creator:
# Default to "local" (publication-specific) metadata; fall back to
# creator-level
- family = contrib.creator.surname or contrib.surname or (contrib.raw_name and contrib.raw_name.split()[-1])
+ family = contrib.creator.surname or contrib.surname or (contrib.raw_name and contrib.raw_name.split()[-1])
if not family:
# CSL requires some surname (family name)
continue
diff --git a/python/fatcat_web/auth.py b/python/fatcat_web/auth.py
index 74b8e2d6..a1ba1929 100644
--- a/python/fatcat_web/auth.py
+++ b/python/fatcat_web/auth.py
@@ -104,7 +104,7 @@ def handle_ia_xauth(email, password):
if resp.status_code == 401 or (not resp.json().get('success')):
try:
flash("Internet Archive email/password didn't match: {}".format(resp.json()['values']['reason']))
- except:
+ except Exception:
app.log.warning("IA XAuth fail: {}".format(resp.content))
return render_template('auth_ia_login.html', email=email), resp.status_code
elif resp.status_code != 200:
diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py
index 7cf1f854..1a573006 100644
--- a/python/fatcat_web/routes.py
+++ b/python/fatcat_web/routes.py
@@ -658,7 +658,7 @@ def release_save(ident):
Config.KAFKA_SAVEPAPERNOW_TOPIC,
json.dumps(msg, sort_keys=True),
)
- except:
+ except Exception:
return render_template('release_save.html', entity=release, form=form, spn_status='kafka-error'), 500
return render_template('release_save.html', entity=release, form=form, spn_status='success'), 200
elif form.errors: