Reformat with black and isort

Author: vdboor

docs/conf.py

@@ -19,14 +19,14 @@
 
 # -- Project information -----------------------------------------------------
 
-project = 'django-fluent-comments'
-copyright = '2018, Diederik van der Boor'
-author = 'Diederik van der Boor'
+project = "django-fluent-comments"
+copyright = "2018, Diederik van der Boor"
+author = "Diederik van der Boor"
 
 # The short X.Y version
-version = '2.1'
+version = "2.1"
 # The full version, including alpha/beta/rc tags
-release = '2.1'
+release = "2.1"
 
 
 # -- General configuration ---------------------------------------------------
@@ -39,21 +39,21 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -65,18 +65,18 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path .
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-#html_theme = 'alabaster'
+# html_theme = 'alabaster'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -87,7 +87,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
@@ -103,7 +103,7 @@
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'django-fluent-commentsdoc'
+htmlhelp_basename = "django-fluent-commentsdoc"
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -112,15 +112,12 @@
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -130,8 +127,13 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'django-fluent-comments.tex', 'django-fluent-comments Documentation',
-     'Diederik van der Boor', 'manual'),
+    (
+        master_doc,
+        "django-fluent-comments.tex",
+        "django-fluent-comments Documentation",
+        "Diederik van der Boor",
+        "manual",
+    ),
 ]
 
 
@@ -140,8 +142,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'django-fluent-comments', 'django-fluent-comments Documentation',
-     [author], 1)
+    (master_doc, "django-fluent-comments", "django-fluent-comments Documentation", [author], 1)
 ]
 
 
@@ -151,9 +152,15 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'django-fluent-comments', 'django-fluent-comments Documentation',
-     author, 'django-fluent-comments', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "django-fluent-comments",
+        "django-fluent-comments Documentation",
+        author,
+        "django-fluent-comments",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
 
 
@@ -162,4 +169,4 @@
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
+intersphinx_mapping = {"https://docs.python.org/": None}

example/article/admin.py

@@ -5,26 +5,30 @@
 
 
 class ArticleAdminForm(ModelForm):
-
     def __init__(self, *args, **kwargs):
         super(ArticleAdminForm, self).__init__(*args, **kwargs)
-        self.fields['publication_date'].required = False  # The admin's .save() method fills in a default.
+        self.fields[
+            "publication_date"
+        ].required = False  # The admin's .save() method fills in a default.
 
 
 class ArticleAdmin(admin.ModelAdmin):
-    prepopulated_fields = {'slug': ('title',)}
+    prepopulated_fields = {"slug": ("title",)}
     form = ArticleAdminForm
 
     fieldsets = (
-        (None, {
-            'fields': ('title', 'slug',),
-        }),
-        ("Contents", {
-            'fields': ('content',),
-        }),
-        ("Publication settings", {
-            'fields': ('publication_date', 'enable_comments',),
-        }),
+        (
+            None,
+            {"fields": ("title", "slug")},
+        ),
+        (
+            "Contents",
+            {"fields": ("content",)},
+        ),
+        (
+            "Publication settings",
+            {"fields": ("publication_date", "enable_comments")},
+        ),
     )
 
     def save_model(self, request, obj, form, change):

example/article/migrations/0001_initial.py

@@ -7,23 +7,30 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Article',
+            name="Article",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=200, verbose_name='Title')),
-                ('slug', models.SlugField(unique=True, verbose_name='Slug')),
-                ('content', models.TextField(verbose_name='Content')),
-                ('publication_date', models.DateTimeField(verbose_name='Publication date')),
-                ('enable_comments', models.BooleanField(default=True, verbose_name='Enable comments')),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                ("title", models.CharField(max_length=200, verbose_name="Title")),
+                ("slug", models.SlugField(unique=True, verbose_name="Slug")),
+                ("content", models.TextField(verbose_name="Content")),
+                ("publication_date", models.DateTimeField(verbose_name="Publication date")),
+                (
+                    "enable_comments",
+                    models.BooleanField(default=True, verbose_name="Enable comments"),
+                ),
             ],
             options={
-                'verbose_name': 'Article',
-                'verbose_name_plural': 'Articles',
+                "verbose_name": "Article",
+                "verbose_name_plural": "Articles",
             },
         ),
     ]

example/article/models.py

@@ -24,7 +24,7 @@ def __str__(self):
         return self.title
 
     def get_absolute_url(self):
-        return reverse('article-details', kwargs={'slug': self.slug})
+        return reverse("article-details", kwargs={"slug": self.slug})
 
     # Optional, give direct access to moderation info via the model:
     comments = property(get_comments_for_model)
@@ -34,7 +34,5 @@ def get_absolute_url(self):
 
 # Give the generic app support for moderation by django-fluent-comments:
 moderate_model(
-    Article,
-    publication_date_field='publication_date',
-    enable_comments_field='enable_comments'
+    Article, publication_date_field="publication_date", enable_comments_field="enable_comments",
 )

example/article/tests/factories.py

@@ -38,15 +38,11 @@ def create_comment(comment_model=None, article=None, user=None, **kwargs):
         comment="Test-Comment",
         submit_date=now(),
         site=Site.objects.get_current(),
-        ip_address='127.0.0.1',
+        ip_address="127.0.0.1",
         is_public=True,
         is_removed=False,
     )
     defaults.update(kwargs)
 
     Comment = comment_model or get_comment_model()
-    return Comment.objects.create(
-        content_type=article_ctype,
-        object_pk=article.pk,
-        **defaults
-    )
+    return Comment.objects.create(content_type=article_ctype, object_pk=article.pk, **defaults,)

example/article/tests/test_admin.py

@@ -6,14 +6,13 @@
 
 
 class AdminCommentsTests(TestCase):
-
     def test_admin_comments_access(self):
         """
         See that the admin renders
         """
-        admin = User.objects.create_superuser('admin2', '[email protected]', 'secret')
-        comment = factories.create_comment(user_name='Test-Name')
+        admin = User.objects.create_superuser("admin2", "[email protected]", "secret")
+        comment = factories.create_comment(user_name="Test-Name")
 
-        self.client.login(username=admin.username, password='secret')
-        response = self.client.get(reverse('admin:fluent_comments_fluentcomment_changelist'))
+        self.client.login(username=admin.username, password="secret")
+        response = self.client.get(reverse("admin:fluent_comments_fluentcomment_changelist"))
         self.assertContains(response, ">Test-Name<", status_code=200)