Merge branch 'main' into csv

bookwyrm/views/admin/celery_status.py

@@ -88,6 +88,7 @@ class CeleryStatus(View):
     def post(self, request):
         """Submit form to clear queues"""
         form = ClearCeleryForm(request.POST)
+        results = []
         if form.is_valid():
             if len(celery.control.ping()) != 0:
                 return HttpResponse(

bookwyrm/views/admin/dashboard.py

@@ -43,7 +43,6 @@ class Dashboard(View):
         ) or not re.match(regex.DOMAIN, settings.EMAIL_SENDER_DOMAIN)
 
         data["email_config_error"] = email_config_error
-        # pylint: disable=line-too-long
         data[
             "email_sender"
         ] = f"{settings.EMAIL_SENDER_NAME}@{settings.EMAIL_SENDER_DOMAIN}"

bookwyrm/views/admin/federation.py

@@ -152,7 +152,7 @@ class FederatedServer(View):
         }
         return TemplateResponse(request, "settings/federation/instance.html", data)
 
-    def post(self, request, server):  # pylint: disable=unused-argument
+    def post(self, request, server):
         """update note"""
         server = get_object_or_404(models.FederatedServer, id=server)
         server.notes = request.POST.get("notes")

bookwyrm/views/admin/imports.py

@@ -63,7 +63,6 @@ class ImportList(View):
         }
         return TemplateResponse(request, "settings/imports/imports.html", data)
 
-    # pylint: disable=unused-argument
     def post(self, request, import_id):
         """Mark an import as complete"""
         import_job = get_object_or_404(models.ImportJob, id=import_id)
@@ -95,7 +94,6 @@ def enable_imports(request):
 
 @require_POST
 @permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
-# pylint: disable=unused-argument
 def set_import_size_limit(request):
     """Limit the amount of books users can import at once"""
     site = models.SiteSettings.objects.get()
@@ -120,7 +118,6 @@ def set_user_import_completed(request, import_id):
 
 @require_POST
 @permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
-# pylint: disable=unused-argument
 def set_user_import_limit(request):
     """Limit how ofter users can import and export their account"""
     site = models.SiteSettings.objects.get()

bookwyrm/views/books/books.py

@@ -204,7 +204,6 @@ def resolve_book(request):
 @login_required
 @require_POST
 @permission_required("bookwyrm.edit_book", raise_exception=True)
-# pylint: disable=unused-argument
 def update_book_from_remote(request, book_id, connector_identifier):
     """load the remote data for this book"""
     connector = connector_manager.load_connector(

bookwyrm/views/books/edit_book.py

@@ -88,7 +88,6 @@ class CreateBook(View):
         data = {"form": forms.EditionForm()}
         return TemplateResponse(request, "book/edit/edit_book.html", data)
 
-    # pylint: disable=too-many-locals
     def post(self, request):
         """create a new book"""
         # returns None if no match is found

bookwyrm/views/helpers.py

@@ -240,7 +240,7 @@ def redirect_to_referer(request, *args, **kwargs):
     return redirect(*args or "/", **kwargs)
 
 
-# pylint: disable=redefined-builtin,invalid-name
+# pylint: disable=redefined-builtin
 def get_mergeable_object_or_404(klass, id):
     """variant of get_object_or_404 that also redirects if id has been merged
     into another object"""

bookwyrm/views/landing/register.py

@@ -97,7 +97,7 @@ class Register(View):
 class ConfirmEmailCode(View):
     """confirm email address"""
 
-    def get(self, request, code):  # pylint: disable=unused-argument
+    def get(self, request, code):
         """you got the code! good work"""
         settings = models.SiteSettings.get()
         if request.user.is_authenticated:
@@ -124,7 +124,7 @@ class ConfirmEmailCode(View):
 class ConfirmEmail(View):
     """enter code to confirm email address"""
 
-    def get(self, request):  # pylint: disable=unused-argument
+    def get(self, request):
         """you need a code! keep looking"""
         settings = models.SiteSettings.get()
         if request.user.is_authenticated or not settings.require_confirm_email:

bookwyrm/views/reading.py

@@ -22,7 +22,6 @@ logger = logging.getLogger(__name__)
 
 
 # pylint: disable=no-self-use
-# pylint: disable=too-many-return-statements
 @method_decorator(login_required, name="dispatch")
 class ReadingStatus(View):
     """consider reading a book"""

bookwyrm/views/rss_feed.py

@@ -7,7 +7,7 @@ from ..models import Review, Quotation, Comment
 
 from .helpers import get_user_from_username
 
-# pylint: disable=no-self-use, unused-argument
+# pylint: disable=no-self-use
 class RssFeed(Feed):
     """serialize user's posts in rss feed"""
 

bookwyrm/views/shelf/shelf.py

@@ -119,7 +119,6 @@ class Shelf(View):
         return TemplateResponse(request, "shelf/shelf.html", data)
 
     @method_decorator(login_required, name="dispatch")
-    # pylint: disable=unused-argument
     def post(self, request, username, shelf_identifier):
         """edit a shelf"""
         user = get_user_from_username(request.user, username)

bookwyrm/views/status.py

@@ -32,7 +32,7 @@ logger = logging.getLogger(__name__)
 class EditStatus(View):
     """the view for *posting*"""
 
-    def get(self, request, status_id):  # pylint: disable=unused-argument
+    def get(self, request, status_id):
         """load the edit panel"""
         status = get_object_or_404(
             models.Status.objects.select_subclasses(), id=status_id