Merge pull request #48 from WhyNotHugo/linting

Minor linting tweaks

Author: timobrembeck

sphinxcontrib_django/docstrings/field_utils.py

@@ -31,20 +31,19 @@ def get_field_type(field, include_role=True):
             f":class:`~{type(field).__module__}.{type(field).__name__}` to"
             f" :class:`~{to.__module__}.{to.__name__}`"
         )
-    elif isinstance(field, models.fields.reverse_related.ForeignObjectRel):
+    if isinstance(field, models.fields.reverse_related.ForeignObjectRel):
         to = field.remote_field.model
         return (
             "Reverse"
             f" :class:`~{type(field.remote_field).__module__}.{type(field.remote_field).__name__}`"
             f" from :class:`~{to.__module__}.{to.__name__}`"
         )
-    else:
-        if include_role:
-            # For the docstrings of attributes, the :class: role is required
-            return f":class:`~{type(field).__module__}.{type(field).__name__}`"
-        else:
-            # For the :param: role in class docstrings, the :class: role is not required
-            return f"~{type(field).__module__}.{type(field).__name__}"
+    if include_role:
+        # For the docstrings of attributes, the :class: role is required
+        return f":class:`~{type(field).__module__}.{type(field).__name__}`"
+
+    # For the :param: role in class docstrings, the :class: role is not required
+    return f"~{type(field).__module__}.{type(field).__name__}"
 
 
 def get_field_verbose_name(field):

sphinxcontrib_django/docstrings/patches.py

@@ -1,6 +1,8 @@
 """
 This module contains patches for Django to improve its interaction with Sphinx.
 """
+import contextlib
+
 from django import apps, forms, test
 from django.db import models
 
@@ -84,10 +86,8 @@ def patch_django_for_autodoc():
     for parent_module_str, django_modules in DJANGO_MODULE_PATHS.items():
         for django_module in django_modules:
             for module_class in map(django_module.__dict__.get, django_module.__all__):
-                try:
+                with contextlib.suppress(AttributeError):
                     module_class.__module__ = parent_module_str
-                except AttributeError:
-                    pass
 
     # Fix module path of model manager
     models.manager.Manager.__module__ = "django.db.models"

tests/conftest.py

@@ -43,8 +43,7 @@ def setup_app_with_different_config(app_params, make_app):
     def setup_app_with_different_config(**confoverrides):
         args, kwargs = app_params
         kwargs["confoverrides"] = confoverrides
-        _app = make_app(*args, **kwargs)
-        return _app
+        return make_app(*args, **kwargs)
 
     return setup_app_with_different_config