From 106f6adc593ac6f7ed8c582aab57baa29380fe30 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 18 Feb 2021 04:29:24 -0500
Subject: [PATCH] fix lgtm alerts

---
 archivebox/cli/tests.py  |  6 +++---
 archivebox/core/admin.py | 15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/archivebox/cli/tests.py b/archivebox/cli/tests.py
index 4d7016aa..5e2e2d96 100644
--- a/archivebox/cli/tests.py
+++ b/archivebox/cli/tests.py
@@ -83,7 +83,7 @@ def output_hidden(show_failing=True):
         sys.stderr.close()
         sys.stdout = stdout
         sys.stderr = stderr
-    except:
+    except Exception:
         sys.stdout.close()
         sys.stderr.close()
         sys.stdout = stdout
@@ -132,7 +132,7 @@ class TestInit(unittest.TestCase):
         try:
             load_main_index(out_dir=OUTPUT_DIR)
             assert False, 'load_main_index should raise an exception when no index is present'
-        except:
+        except Exception:
             pass
 
     def test_no_dirty_state(self):
@@ -216,7 +216,7 @@ class TestRemove(unittest.TestCase):
             with output_hidden(show_failing=False):
                 archivebox_remove.main(['--yes', '--delete', 'https://doesntexist.com'])
             assert False, 'Should raise if no URLs match'
-        except:
+        except Exception:
             pass
 
 
diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py
index d51698eb..cfd4babb 100644
--- a/archivebox/core/admin.py
+++ b/archivebox/core/admin.py
@@ -201,46 +201,46 @@ class SnapshotAdmin(SearchResultsAdminMixin, admin.ModelAdmin):
         return rendered_response
 
 
-    def update_snapshots(modeladmin, request, queryset):
+    def update_snapshots(self, request, queryset):
         archive_links([
             snapshot.as_link()
             for snapshot in queryset
         ], out_dir=OUTPUT_DIR)
     update_snapshots.short_description = "Archive"
 
-    def update_titles(modeladmin, request, queryset):
+    def update_titles(self, request, queryset):
         archive_links([
             snapshot.as_link()
             for snapshot in queryset
         ], overwrite=True, methods=('title','favicon'), out_dir=OUTPUT_DIR)
     update_titles.short_description = "Pull title"
 
-    def overwrite_snapshots(modeladmin, request, queryset):
+    def overwrite_snapshots(self, request, queryset):
         archive_links([
             snapshot.as_link()
             for snapshot in queryset
         ], overwrite=True, out_dir=OUTPUT_DIR)
     overwrite_snapshots.short_description = "Re-archive (overwrite)"
 
-    def verify_snapshots(modeladmin, request, queryset):
+    def verify_snapshots(self, request, queryset):
         for snapshot in queryset:
             print(snapshot.timestamp, snapshot.url, snapshot.is_archived, snapshot.archive_size, len(snapshot.history))
 
     verify_snapshots.short_description = "Check"
 
-    def delete_snapshots(modeladmin, request, queryset):
+    def delete_snapshots(self, request, queryset):
         remove(snapshots=queryset, yes=True, delete=True, out_dir=OUTPUT_DIR)
 
     delete_snapshots.short_description = "Delete"
 
-    def add_tag(modeladmin, request, queryset):
+    def add_tag(self, request, queryset):
         tag = request.POST['tag']
         for obj in queryset:
             obj.tags.add(tag)
 
     add_tag.short_description = "Add tag"
 
-    def remove_tag(modeladmin, request, queryset):
+    def remove_tag(self, request, queryset):
         tag = request.POST['tag']
         for obj in queryset:
             obj.tags.remove(tag)
@@ -286,7 +286,6 @@ class TagAdmin(admin.ModelAdmin):
             )
             for snap in obj.snapshot_set.order_by('-updated')[:10]
         ) + (f'<br/><a href="/admin/core/snapshot/?tags__id__exact={obj.id}">and {total_count-10} more...<a>' if obj.snapshot_set.count() > 10 else ''))
-        return 
 
 
 class ArchiveResultAdmin(admin.ModelAdmin):