From 037cc35eeb028d11b92854aa2d7ac8ed0b0a54c8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 25 Jan 2022 08:45:08 -0800
Subject: [PATCH] Adds merge migration and python formatting

---
 bookwyrm/forms.py                               |  1 +
 bookwyrm/migrations/0131_merge_20220125_1644.py | 14 ++++++++++++++
 bookwyrm/urls.py                                |  6 +++++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/migrations/0131_merge_20220125_1644.py

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 5f068a935..5a04af8c8 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -443,6 +443,7 @@ class ListForm(CustomForm):
         model = models.List
         fields = ["user", "name", "description", "curation", "privacy", "group"]
 
+
 class ListItemForm(CustomForm):
     class Meta:
         model = models.ListItem
diff --git a/bookwyrm/migrations/0131_merge_20220125_1644.py b/bookwyrm/migrations/0131_merge_20220125_1644.py
new file mode 100644
index 000000000..c0cd56828
--- /dev/null
+++ b/bookwyrm/migrations/0131_merge_20220125_1644.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.10 on 2022-01-25 16:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0130_alter_listitem_notes'),
+        ('bookwyrm', '0130_alter_user_preferred_language'),
+    ]
+
+    operations = [
+    ]
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index b1485789b..e330408b0 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -357,7 +357,11 @@ urlpatterns = [
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/saved/?$", views.SavedLists.as_view(), name="saved-lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
-    re_path(r"^list/(?P<list_id>\d+)/item/(?P<list_item>\d+)/?$", views.ListItem.as_view(), name="list-item"),
+    re_path(
+        r"^list/(?P<list_id>\d+)/item/(?P<list_item>\d+)/?$",
+        views.ListItem.as_view(),
+        name="list-item",
+    ),
     re_path(r"^list/delete/(?P<list_id>\d+)/?$", views.delete_list, name="delete-list"),
     re_path(r"^list/add-book/?$", views.add_book, name="list-add-book"),
     re_path(