From 9921a1e75458e47a6c25bd7d615d6443d2b20366 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 8 Apr 2022 14:23:37 -0700 Subject: [PATCH] Various pylint complaince fixes --- bookwyrm/models/fields.py | 2 +- bookwyrm/tests/activitypub/test_author.py | 4 ++++ bookwyrm/tests/models/test_base_model.py | 2 +- bookwyrm/tests/models/test_fields.py | 2 +- bookwyrm/tests/models/test_user_model.py | 10 +++++----- bookwyrm/tests/test_signing.py | 4 ++-- bookwyrm/tests/views/inbox/test_inbox_announce.py | 4 ++-- bookwyrm/tests/views/test_author.py | 2 +- bookwyrm/tests/views/test_helpers.py | 2 +- bookwyrm/tests/views/test_user.py | 2 +- 10 files changed, 19 insertions(+), 15 deletions(-) diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index 5a03df015..62c61cc40 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -125,7 +125,7 @@ class ActivitypubFieldMixin: """model_field_name to activitypubFieldName""" if self.activitypub_field: return self.activitypub_field - name = self.name.split(".")[-1] + name = self.name.rsplit(".", maxsplit=1)[-1] components = name.split("_") return components[0] + "".join(x.title() for x in components[1:]) diff --git a/bookwyrm/tests/activitypub/test_author.py b/bookwyrm/tests/activitypub/test_author.py index 0a344340a..04439d137 100644 --- a/bookwyrm/tests/activitypub/test_author.py +++ b/bookwyrm/tests/activitypub/test_author.py @@ -4,7 +4,10 @@ from bookwyrm import models class Author(TestCase): + """ serialize author tests """ + def setUp(self): + """ initial data """ self.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", @@ -16,6 +19,7 @@ class Author(TestCase): ) def test_serialize_model(self): + """ check presense of author fields """ activity = self.author.to_activity() self.assertEqual(activity["id"], self.author.remote_id) self.assertIsInstance(activity["aliases"], list) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index ae6d12077..8a8be2148 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -38,7 +38,7 @@ class BaseModel(TestCase): def test_remote_id(self): """these should be generated""" - self.test_model.id = 1 + self.test_model.id = 1 # pylint: disable=invalid-name expected = self.test_model.get_remote_id() self.assertEqual(expected, f"https://{DOMAIN}/bookwyrmtestmodel/1") diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index f7386c2e4..ed50d708e 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -161,7 +161,7 @@ class ModelFields(TestCase): @dataclass(init=False) class TestActivity(ActivityObject): """real simple mock""" - + # pylint: disbale=invalid-name to: List[str] cc: List[str] id: str = "http://hi.com" diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index aa62dce3a..adcee8fb9 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -17,7 +17,7 @@ class User(TestCase): "bookwyrm.activitystreams.populate_stream_task.delay" ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): self.user = models.User.objects.create_user( - "mouse@%s" % DOMAIN, + f"mouse@{DOMAIN}", "mouse@mouse.mouse", "mouseword", local=True, @@ -107,7 +107,7 @@ class User(TestCase): def test_get_or_create_remote_server(self): responses.add( responses.GET, - "https://%s/.well-known/nodeinfo" % DOMAIN, + f"https://{DOMAIN}/.well-known/nodeinfo", json={"links": [{"href": "http://www.example.com"}, {}]}, ) responses.add( @@ -124,7 +124,7 @@ class User(TestCase): @responses.activate def test_get_or_create_remote_server_no_wellknown(self): responses.add( - responses.GET, "https://%s/.well-known/nodeinfo" % DOMAIN, status=404 + responses.GET, f"https://{DOMAIN}/.well-known/nodeinfo", status=404 ) server = models.user.get_or_create_remote_server(DOMAIN) @@ -136,7 +136,7 @@ class User(TestCase): def test_get_or_create_remote_server_no_links(self): responses.add( responses.GET, - "https://%s/.well-known/nodeinfo" % DOMAIN, + f"https://{DOMAIN}/.well-known/nodeinfo", json={"links": [{"href": "http://www.example.com"}, {}]}, ) responses.add(responses.GET, "http://www.example.com", status=404) @@ -150,7 +150,7 @@ class User(TestCase): def test_get_or_create_remote_server_unknown_format(self): responses.add( responses.GET, - "https://%s/.well-known/nodeinfo" % DOMAIN, + f"https://{DOMAIN}/.well-known/nodeinfo", json={"links": [{"href": "http://www.example.com"}, {}]}, ) responses.add(responses.GET, "http://www.example.com", json={"fish": "salmon"}) diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index da67a8de3..26d5e99a9 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -64,8 +64,8 @@ class Signature(TestCase): def send(self, signature, now, data, digest): """test request""" - c = Client() - return c.post( + client = Client() + return client.post( urlsplit(self.rat.inbox).path, data=data, content_type="application/json", diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 01580c922..c77c18bc5 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -61,7 +61,7 @@ class InboxActivities(TestCase): self.assertEqual(models.Notification.objects.count(), 0) activity = { "type": "Announce", - "id": "%s/boost" % self.status.remote_id, + "id": f"{self.status.remote_id}/boost", "actor": self.remote_user.remote_id, "object": self.status.remote_id, "to": ["https://www.w3.org/ns/activitystreams#public"], @@ -94,7 +94,7 @@ class InboxActivities(TestCase): self.assertEqual(models.Notification.objects.count(), 0) activity = { "type": "Announce", - "id": "%s/boost" % self.status.remote_id, + "id": f"{self.status.remote_id}/boost", "actor": self.remote_user.remote_id, "object": "https://remote.com/status/1", "to": ["https://www.w3.org/ns/activitystreams#public"], diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index 71daef2a4..1f8fc51c5 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -66,7 +66,7 @@ class AuthorViews(TestCase): def test_author_page_edition_author(self): """there are so many views, this just makes sure it LOADS""" view = views.Author.as_view() - another_book = models.Edition.objects.create( + models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=self.work, diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index 8fe04f513..a092a4c9a 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -139,7 +139,7 @@ class ViewsHelpers(TestCase): } responses.add( responses.GET, - "https://example.com/.well-known/webfinger?resource=acct:%s" % username, + f"https://example.com/.well-known/webfinger?resource=acct:{username}", json=wellknown, status=200, ) diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index f65ffa514..e632819b5 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -83,7 +83,7 @@ class UserViews(TestCase): def test_user_page_domain(self): """when the user domain has dashes in it""" with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( + models.User.objects.create_user( "nutria", "", "nutriaword",