Merge pull request #3398 from bookwyrm-social/pylint3

Upgrade pylint to 3.x

.pylintrc

@@ -3,7 +3,19 @@ ignore=migrations
 load-plugins=pylint.extensions.no_self_use
 
 [MESSAGES CONTROL]
-disable=E1101,E1135,E1136,R0903,R0901,R0902,W0707,W0511,W0406,R0401,R0801,C3001,import-error
+disable =
+    cyclic-import,
+    duplicate-code,
+    fixme,
+    no-member,
+    raise-missing-from,
+    too-few-public-methods,
+    too-many-ancestors,
+    too-many-instance-attributes,
+    unnecessary-lambda-assignment,
+    unsubscriptable-object,
+enable =
+    useless-suppression
 
 [FORMAT]
 max-line-length=88

bookwyrm/activitypub/book.py

@@ -67,7 +67,6 @@ class Edition(Book):
     type: str = "Edition"
 
 
-# pylint: disable=invalid-name
 @dataclass(init=False)
 class Work(Book):
     """work instance of a book object"""

bookwyrm/activitypub/ordered_collection.py

@@ -18,7 +18,6 @@ class OrderedCollection(ActivityObject):
     type: str = "OrderedCollection"
 
 
-# pylint: disable=invalid-name
 @dataclass(init=False)
 class OrderedCollectionPrivate(OrderedCollection):
     """an ordered collection with privacy settings"""

bookwyrm/activitypub/verbs.py

@@ -22,7 +22,6 @@ def action(self, allow_external_connections=True):
             self.object.to_model(allow_external_connections=allow_external_connections)
 
 
-# pylint: disable=invalid-name
 @dataclass(init=False)
 class Create(Verb):
     """Create activity"""
@@ -33,7 +32,6 @@ class Create(Verb):
     type: str = "Create"
 
 
-# pylint: disable=invalid-name
 @dataclass(init=False)
 class Delete(Verb):
     """Create activity"""
@@ -63,7 +61,6 @@ def action(self, allow_external_connections=True):
         # if we can't find it, we don't need to delete it because we don't have it
 
 
-# pylint: disable=invalid-name
 @dataclass(init=False)
 class Update(Verb):
     """Update activity"""
@@ -227,7 +224,6 @@ def action(self, allow_external_connections=True):
         self.to_model(allow_external_connections=allow_external_connections)
 
 
-# pylint: disable=invalid-name
 @dataclass(init=False)
 class Announce(Verb):
     """boosting a status"""

bookwyrm/activitystreams.py

@@ -32,7 +32,7 @@ def unread_by_status_type_id(self, user_id):
         stream_id = self.stream_id(user_id)
         return f"{stream_id}-unread-by-type"
 
-    def get_rank(self, obj):  # pylint: disable=no-self-use
+    def get_rank(self, obj):
         """statuses are sorted by date published"""
         return obj.published_date.timestamp()
 

bookwyrm/apps.py

@@ -33,7 +33,6 @@ class BookwyrmConfig(AppConfig):
     name = "bookwyrm"
     verbose_name = "BookWyrm"
 
-    # pylint: disable=no-self-use
     def ready(self):
         """set up OTLP and preview image files, if desired"""
         if settings.OTEL_EXPORTER_OTLP_ENDPOINT or settings.OTEL_EXPORTER_CONSOLE:

bookwyrm/book_search.py

@@ -36,7 +36,6 @@ def search(
     ...
 
 
-# pylint: disable=arguments-differ
 def search(
     query: str,
     *,

bookwyrm/context_processors.py

@@ -2,7 +2,7 @@
 from bookwyrm import models, settings
 
 
-def site_settings(request):  # pylint: disable=unused-argument
+def site_settings(request):
     """include the custom info about the site"""
     request_protocol = "https://"
     if not request.is_secure():

bookwyrm/forms/custom_form.py

@@ -15,9 +15,9 @@ def __init__(self, *args, **kwargs):
         css_classes["number"] = "input"
         css_classes["checkbox"] = "checkbox"
         css_classes["textarea"] = "textarea"
-        # pylint: disable=super-with-arguments
         super().__init__(*args, **kwargs)
         for visible in self.visible_fields():
+            input_type = ""
             if hasattr(visible.field.widget, "input_type"):
                 input_type = visible.field.widget.input_type
             if isinstance(visible.field.widget, Textarea):

bookwyrm/forms/landing.py

@@ -34,7 +34,6 @@ def infer_username(self):
 
     def add_invalid_password_error(self):
         """We don't want to be too specific about this"""
-        # pylint: disable=attribute-defined-outside-init
         self.non_field_errors = _("Username or password are incorrect")
 
 

bookwyrm/forms/widgets.py

@@ -5,8 +5,6 @@
 class ArrayWidget(forms.widgets.TextInput):
     """Inputs for postgres array fields"""
 
-    # pylint: disable=unused-argument
-    # pylint: disable=no-self-use
     def value_from_datadict(self, data, files, name):
         """get all values for this name"""
         return [i for i in data.getlist(name) if i]

bookwyrm/importers/importer.py

@@ -36,7 +36,6 @@ class Importer:
         "reading": ["currently-reading", "reading", "currently reading"],
     }
 
-    # pylint: disable=too-many-locals
     def create_job(
         self, user: User, csv_file: Iterable[str], include_reviews: bool, privacy: str
     ) -> ImportJob:

bookwyrm/importers/librarything_import.py

@@ -20,7 +20,7 @@ class LibrarythingImporter(Importer):
 
     def normalize_row(
         self, entry: dict[str, str], mappings: dict[str, Optional[str]]
-    ) -> dict[str, Optional[str]]:  # pylint: disable=no-self-use
+    ) -> dict[str, Optional[str]]:
         """use the dataclass to create the formatted row of data"""
         normalized = {
             k: _remove_brackets(entry.get(v) if v else None)

bookwyrm/lists_stream.py

@@ -18,7 +18,7 @@ def stream_id(self, user):  # pylint: disable=no-self-use
             return f"{user}-lists"
         return f"{user.id}-lists"
 
-    def get_rank(self, obj):  # pylint: disable=no-self-use
+    def get_rank(self, obj):
         """lists are sorted by updated date"""
         return obj.updated_date.timestamp()
 

bookwyrm/models/activitypub_mixin.py

@@ -31,7 +31,7 @@
 
 PropertyField = namedtuple("PropertyField", ("set_activity_from_field"))
 
-# pylint: disable=invalid-name
+
 def set_activity_from_property_field(activity, obj, field):
     """assign a model property value to the activity json"""
     activity[field[1]] = getattr(obj, field[0])

bookwyrm/models/book.py

@@ -133,7 +133,6 @@ def merge_into(self, canonical: Self, dry_run=False) -> Dict[str, Any]:
         related_models = [
             (r.remote_field.name, r.related_model) for r in self._meta.related_objects
         ]
-        # pylint: disable=protected-access
         for related_field, related_model in related_models:
             # Skip the ManyToMany fields that aren’t auto-created. These
             # should have a corresponding OneToMany field in the model for

bookwyrm/models/bookwyrm_export_job.py

@@ -27,7 +27,7 @@
 class BookwyrmAwsSession(BotoSession):
     """a boto session that always uses settings.AWS_S3_ENDPOINT_URL"""
 
-    def client(self, *args, **kwargs):  # pylint: disable=arguments-differ
+    def client(self, *args, **kwargs):
         kwargs["endpoint_url"] = settings.AWS_S3_ENDPOINT_URL
         return super().client("s3", *args, **kwargs)
 

bookwyrm/models/fields.py

@@ -193,8 +193,7 @@ class UsernameField(ActivitypubFieldMixin, models.CharField):
 
     def __init__(self, activitypub_field="preferredUsername", **kwargs):
         self.activitypub_field = activitypub_field
-        # I don't totally know why pylint is mad at this, but it makes it work
-        super(ActivitypubFieldMixin, self).__init__(  # pylint: disable=bad-super-call
+        super(ActivitypubFieldMixin, self).__init__(
             _("username"),
             max_length=150,
             unique=True,
@@ -234,7 +233,6 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, max_length=255, choices=PrivacyLevels, default="public")
 
-    # pylint: disable=invalid-name
     def set_field_from_activity(
         self, instance, data, overwrite=True, allow_external_connections=True
     ):
@@ -276,7 +274,6 @@ def set_activity_from_field(self, activity, instance):
         if hasattr(instance, "mention_users"):
             mentions = [u.remote_id for u in instance.mention_users.all()]
         # this is a link to the followers list
-        # pylint: disable=protected-access
         followers = instance.user.followers_url
         if instance.privacy == "public":
             activity["to"] = [self.public]
@@ -444,7 +441,7 @@ def __init__(self, *args, alt_field=None, **kwargs):
         self.alt_field = alt_field
         super().__init__(*args, **kwargs)
 
-    # pylint: disable=arguments-differ,arguments-renamed,too-many-arguments
+    # pylint: disable=arguments-renamed,too-many-arguments
     def set_field_from_activity(
         self, instance, data, save=True, overwrite=True, allow_external_connections=True
     ):

bookwyrm/models/import_job.py

@@ -352,7 +352,7 @@ def import_item_task(item_id):
 
     try:
         item.resolve()
-    except Exception as err:  # pylint: disable=broad-except
+    except Exception as err:
         item.fail_reason = _("Error loading book")
         item.save()
         item.update_job()

bookwyrm/models/relationship.py

@@ -135,7 +135,7 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
     status = "follow_request"
     activity_serializer = activitypub.Follow
 
-    def save(self, *args, broadcast=True, **kwargs):  # pylint: disable=arguments-differ
+    def save(self, *args, broadcast=True, **kwargs):
         """make sure the follow or block relationship doesn't already exist"""
         # if there's a request for a follow that already exists, accept it
         # without changing the local database state

bookwyrm/models/status.py

@@ -98,7 +98,7 @@ def save(self, *args, update_fields: Optional[Iterable[str]] = None, **kwargs):
             self.thread_id = self.id
             super().save(broadcast=False, update_fields=["thread_id"])
 
-    def delete(self, *args, **kwargs):  # pylint: disable=unused-argument
+    def delete(self, *args, **kwargs):
         """ "delete" a status"""
         if hasattr(self, "boosted_status"):
             # okay but if it's a boost really delete it
@@ -213,7 +213,7 @@ def to_replies(self, **kwargs):
             **kwargs,
         ).serialize()
 
-    def to_activity_dataclass(self, pure=False):  # pylint: disable=arguments-differ
+    def to_activity_dataclass(self, pure=False):
         """return tombstone if the status is deleted"""
         if self.deleted:
             return activitypub.Tombstone(

bookwyrm/models/user.py

@@ -409,7 +409,6 @@ def save(self, *args, update_fields: Optional[Iterable[str]] = None, **kwargs):
 
     def delete(self, *args, **kwargs):
         """We don't actually delete the database entry"""
-        # pylint: disable=attribute-defined-outside-init
         self.is_active = False
         self.allow_reactivation = False
         self.is_deleted = True
@@ -452,15 +451,13 @@ def erase_user_statuses(self, broadcast=True):
 
     def deactivate(self):
         """Disable the user but allow them to reactivate"""
-        # pylint: disable=attribute-defined-outside-init
         self.is_active = False
         self.deactivation_reason = "self_deactivation"
         self.allow_reactivation = True
         super().save(broadcast=False)
 
     def reactivate(self):
         """Now you want to come back, huh?"""
-        # pylint: disable=attribute-defined-outside-init
         if not self.allow_reactivation:
             return
         self.is_active = True

bookwyrm/preview_images.py

@@ -420,7 +420,6 @@ def save_and_cleanup(image, instance=None):
     return True
 
 
-# pylint: disable=invalid-name
 @app.task(queue=IMAGES)
 def generate_site_preview_image_task():
     """generate preview_image for the website"""
@@ -445,7 +444,6 @@ def generate_site_preview_image_task():
     save_and_cleanup(image, instance=site)
 
 
-# pylint: disable=invalid-name
 @app.task(queue=IMAGES)
 def generate_edition_preview_image_task(book_id):
     """generate preview_image for a book"""

bookwyrm/signatures.py

@@ -6,7 +6,7 @@
 
 from Crypto import Random
 from Crypto.PublicKey import RSA
-from Crypto.Signature import pkcs1_15  # pylint: disable=no-name-in-module
+from Crypto.Signature import pkcs1_15
 from Crypto.Hash import SHA256
 
 MAX_SIGNATURE_AGE = 300
@@ -84,7 +84,6 @@ def __init__(self, key_id, headers, signature):
         self.headers = headers
         self.signature = signature
 
-    # pylint: disable=invalid-name
     @classmethod
     def parse(cls, request):
         """extract and parse a signature from an http request"""

bookwyrm/suggested_users.py

@@ -34,7 +34,6 @@ def store_id(self, user):  # pylint: disable=no-self-use
 
     def get_counts_from_rank(self, rank):  # pylint: disable=no-self-use
         """calculate mutuals count and shared books count from rank"""
-        # pylint: disable=c-extension-no-member
         return {
             "mutuals": math.floor(rank),
             # "shared_books": int(1 / (-1 * (rank % 1 - 1))) - 1,
@@ -128,7 +127,6 @@ def get_annotated_users(viewer, *args, **kwargs):
                 ),
                 distinct=True,
             ),
-            # pylint: disable=line-too-long
             # shared_books=Count(
             #     "shelfbook",
             #     filter=Q(
@@ -202,7 +200,7 @@ def update_suggestions_on_unfollow(sender, instance, **kwargs):
 
 
 @receiver(signals.post_save, sender=models.User)
-# pylint: disable=unused-argument, too-many-arguments
+# pylint: disable=unused-argument
 def update_user(sender, instance, created, update_fields=None, **kwargs):
     """an updated user, neat"""
     # a new user is found, create suggestions for them

bookwyrm/tests/connectors/test_abstract_connector.py

@@ -115,7 +115,6 @@ def test_get_or_create_book_deduped(self):
     @responses.activate
     def test_get_or_create_author(self):
         """load an author"""
-        # pylint: disable=attribute-defined-outside-init
         self.connector.author_mappings = [
             Mapping("id"),
             Mapping("name"),
@@ -141,7 +140,6 @@ def test_get_or_create_author_existing(self):
     def test_update_author_from_remote(self):
         """trigger the function that looks up the remote data"""
         author = models.Author.objects.create(name="Test", openlibrary_key="OL123A")
-        # pylint: disable=attribute-defined-outside-init
         self.connector.author_mappings = [
             Mapping("id"),
             Mapping("name"),

bookwyrm/tests/models/test_activitypub_mixin.py

@@ -20,7 +20,7 @@
 from bookwyrm.settings import PAGE_LENGTH
 
 
-# pylint: disable=invalid-name,too-many-public-methods
+# pylint: disable=too-many-public-methods
 @patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async")
 class ActivitypubMixins(TestCase):

bookwyrm/tests/models/test_base_model.py

@@ -42,7 +42,7 @@ class BookWyrmTestModel(base_model.BookWyrmModel):
 
     def test_remote_id(self):
         """these should be generated"""
-        self.test_model.id = 1  # pylint: disable=invalid-name
+        self.test_model.id = 1
         expected = self.test_model.get_remote_id()
         self.assertEqual(expected, f"{BASE_URL}/bookwyrmtestmodel/1")
 

bookwyrm/tests/models/test_bookwyrm_import_job.py

@@ -13,7 +13,7 @@
 from bookwyrm.models import bookwyrm_import_job
 
 
-class BookwyrmImport(TestCase):  # pylint: disable=too-many-public-methods
+class BookwyrmImport(TestCase):
     """testing user import functions"""
 
     def setUp(self):

bookwyrm/tests/models/test_shelf_model.py

@@ -6,7 +6,6 @@
 from bookwyrm import models, settings
 
 
-# pylint: disable=unused-argument
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.lists_stream.populate_lists_task.delay")

bookwyrm/tests/test_merge.py

@@ -10,7 +10,7 @@ class MergeBookDataModel(TestCase):
     """test merging of subclasses of BookDataModel"""
 
     @classmethod
-    def setUpTestData(cls):  # pylint: disable=invalid-name
+    def setUpTestData(cls):
         """shared data"""
         models.SiteSettings.objects.create()