Pylint fixes

atodorov · atodorov · commit 0c39d3673d76 · 2021-11-11T12:51:41.000+02:00
diff --git a/pylint_django/augmentations/__init__.py b/pylint_django/augmentations/__init__.py
@@ -273,8 +273,8 @@
 VIEW_ATTRS = {
     (
         (
-            '{}.{}'.format(cls.__module__, cls.__name__),
-            '.{}'.format(cls.__name__)
+            f'{cls.__module__}.{cls.__name__}',
+            f'.{cls.__name__}',
         ),
         tuple(cls.__dict__.keys())
     ) for cls in (
diff --git a/pylint_django/checkers/auth_user.py b/pylint_django/checkers/auth_user.py
@@ -10,14 +10,14 @@ class AuthUserChecker(checkers.BaseChecker):
 
     name = 'auth-user-checker'
 
-    msgs = {'E%d41' % BASE_ID: ("Hard-coded 'auth.User'",
-                                'hard-coded-auth-user',
-                                "Don't hard-code the auth.User model. "
-                                "Use settings.AUTH_USER_MODEL instead!"),
-            'E%d42' % BASE_ID: ("User model imported from django.contrib.auth.models",
-                                'imported-auth-user',
-                                "Don't import django.contrib.auth.models.User model. "
-                                "Use django.contrib.auth.get_user_model() instead!")}
+    msgs = {f'E{BASE_ID}41': ("Hard-coded 'auth.User'",
+                              'hard-coded-auth-user',
+                              "Don't hard-code the auth.User model. "
+                              "Use settings.AUTH_USER_MODEL instead!"),
+            f'E{BASE_ID}42': ("User model imported from django.contrib.auth.models",
+                              'imported-auth-user',
+                              "Don't import django.contrib.auth.models.User model. "
+                              "Use django.contrib.auth.get_user_model() instead!")}
 
     @utils.check_messages('hard-coded-auth-user')
     def visit_const(self, node):
diff --git a/pylint_django/checkers/django_installed.py b/pylint_django/checkers/django_installed.py
@@ -8,15 +8,15 @@ class DjangoInstalledChecker(BaseChecker):
     name = 'django-installed-checker'
 
     msgs = {
-        'F%s01' % BASE_ID: ("Django is not available on the PYTHONPATH",
-                            'django-not-available',
-                            "Django could not be imported by the pylint-django plugin, so most Django related "
-                            "improvements to pylint will fail."),
+        f'F{BASE_ID}01': ("Django is not available on the PYTHONPATH",
+                          'django-not-available',
+                          "Django could not be imported by the pylint-django plugin, so most Django related "
+                          "improvements to pylint will fail."),
 
-        'W%s99' % BASE_ID: ('Placeholder message to prevent disabling of checker',
-                            'django-not-available-placeholder',
-                            'PyLint does not recognise checkers as being enabled unless they have at least'
-                            ' one message which is not fatal...')
+        f'W{BASE_ID}99': ('Placeholder message to prevent disabling of checker',
+                          'django-not-available-placeholder',
+                          'PyLint does not recognise checkers as being enabled unless they have at least'
+                          ' one message which is not fatal...')
     }
 
     @check_messages('django-not-available')
diff --git a/pylint_django/checkers/foreign_key_strings.py b/pylint_django/checkers/foreign_key_strings.py
@@ -44,15 +44,13 @@ class ForeignKeyStringsChecker(BaseChecker):
     )
 
     msgs = {
-        "E%s10"
-        % BASE_ID: (
+        f"E{BASE_ID}10": (
             "Django was not configured. For more information run "
             "pylint --load-plugins=pylint_django --help-msg=django-not-configured",
             "django-not-configured",
             _LONG_MESSAGE,
         ),
-        "F%s10"
-        % BASE_ID: (
+        f"F{BASE_ID}10": (
             "Provided Django settings %s could not be loaded",
             "django-settings-module-not-found",
             "The provided Django settings module %s was not found on the path",
diff --git a/pylint_django/checkers/forms.py b/pylint_django/checkers/forms.py
@@ -22,10 +22,10 @@ class FormChecker(BaseChecker):
 
     name = 'django-form-checker'
     msgs = {
-        'W%d04' % BASE_ID: ("Use explicit fields instead of exclude in ModelForm",
-                            'modelform-uses-exclude',
-                            "Prevents accidentally allowing users to set fields, "
-                            "especially when adding new fields to a Model")
+        f'W{BASE_ID}04': ("Use explicit fields instead of exclude in ModelForm",
+                          'modelform-uses-exclude',
+                          "Prevents accidentally allowing users to set fields, "
+                          "especially when adding new fields to a Model")
     }
 
     @check_messages('modelform-uses-exclude')
@@ -46,5 +46,5 @@ def visit_classdef(self, node):
                 continue
 
             if child.targets[0].name == 'exclude':
-                self.add_message('W%s04' % BASE_ID, node=child)
+                self.add_message(f'W{BASE_ID}04', node=child)
                 break
diff --git a/pylint_django/checkers/json_response.py b/pylint_django/checkers/json_response.py
@@ -23,17 +23,17 @@ class JsonResponseChecker(checkers.BaseChecker):
 
     # configuration section name
     name = 'json-response-checker'
-    msgs = {'R%s01' % BASE_ID: ("Instead of HttpResponse(json.dumps(data)) use JsonResponse(data)",
-                                'http-response-with-json-dumps',
-                                'Used when json.dumps() is used as an argument to HttpResponse().'),
-            'R%s02' % BASE_ID: ("Instead of HttpResponse(content_type='application/json') use JsonResponse()",
-                                'http-response-with-content-type-json',
-                                'Used when HttpResponse() is returning application/json.'),
-            'R%s03' % BASE_ID: ("Redundant content_type parameter for JsonResponse()",
-                                'redundant-content-type-for-json-response',
-                                'Used when JsonResponse() contains content_type parameter. '
-                                'This is either redundant or the content_type is not JSON '
-                                'which is probably an error.')}
+    msgs = {f'R{BASE_ID}01': ("Instead of HttpResponse(json.dumps(data)) use JsonResponse(data)",
+                              'http-response-with-json-dumps',
+                              'Used when json.dumps() is used as an argument to HttpResponse().'),
+            f'R{BASE_ID}02': ("Instead of HttpResponse(content_type='application/json') use JsonResponse()",
+                              'http-response-with-content-type-json',
+                              'Used when HttpResponse() is returning application/json.'),
+            f'R{BASE_ID}03': ("Redundant content_type parameter for JsonResponse()",
+                              'redundant-content-type-for-json-response',
+                              'Used when JsonResponse() contains content_type parameter. '
+                              'This is either redundant or the content_type is not JSON '
+                              'which is probably an error.')}
 
     @utils.check_messages('http-response-with-json-dumps',
                           'http-response-with-content-type-json',
diff --git a/pylint_django/checkers/migrations.py b/pylint_django/checkers/migrations.py
@@ -58,10 +58,10 @@ class NewDbFieldWithDefaultChecker(checkers.BaseChecker):
 
     # configuration section name
     name = 'new-db-field-with-default'
-    msgs = {'W%s98' % BASE_ID: ("%s AddField with default value",
-                                'new-db-field-with-default',
-                                'Used when Pylint detects migrations adding new '
-                                'fields with a default value.')}
+    msgs = {f'W{BASE_ID}98': ("%s AddField with default value",
+                              'new-db-field-with-default',
+                              'Used when Pylint detects migrations adding new '
+                              'fields with a default value.')}
 
     _migration_modules = []
     _possible_offences = {}
@@ -117,10 +117,10 @@ class MissingBackwardsMigrationChecker(checkers.BaseChecker):
 
     name = 'missing-backwards-migration-callable'
 
-    msgs = {'W%s97' % BASE_ID: ('Always include backwards migration callable',
-                                'missing-backwards-migration-callable',
-                                'Always include a backwards/reverse callable counterpart'
-                                ' so that the migration is not irreversable.')}
+    msgs = {f'W{BASE_ID}97': ('Always include backwards migration callable',
+                              'missing-backwards-migration-callable',
+                              'Always include a backwards/reverse callable counterpart'
+                              ' so that the migration is not irreversable.')}
 
     @utils.check_messages('missing-backwards-migration-callable')
     def visit_call(self, node):
diff --git a/pylint_django/checkers/models.py b/pylint_django/checkers/models.py
@@ -12,20 +12,20 @@
 
 
 MESSAGES = {
-    'E%d01' % BASE_ID: ("__unicode__ on a model must be callable (%s)",
-                        'model-unicode-not-callable',
-                        "Django models require a callable __unicode__ method"),
-    'W%d01' % BASE_ID: ("No __unicode__ method on model (%s)",
-                        'model-missing-unicode',
-                        "Django models should implement a __unicode__ method for string representation"),
-    'W%d02' % BASE_ID: ("Found __unicode__ method on model (%s). Python3 uses __str__.",
-                        'model-has-unicode',
-                        "Django models should not implement a __unicode__ "
-                        "method for string representation when using Python3"),
-    'W%d03' % BASE_ID: ("Model does not explicitly define __unicode__ (%s)",
-                        'model-no-explicit-unicode',
-                        "Django models should implement a __unicode__ method for string representation. "
-                        "A parent class of this model does, but ideally all models should be explicit.")
+    f'E{BASE_ID}01': ("__unicode__ on a model must be callable (%s)",
+                      'model-unicode-not-callable',
+                      "Django models require a callable __unicode__ method"),
+    f'W{BASE_ID}01': ("No __unicode__ method on model (%s)",
+                      'model-missing-unicode',
+                      "Django models should implement a __unicode__ method for string representation"),
+    f'W{BASE_ID}02': ("Found __unicode__ method on model (%s). Python3 uses __str__.",
+                      'model-has-unicode',
+                      "Django models should not implement a __unicode__ "
+                      "method for string representation when using Python3"),
+    f'W{BASE_ID}03': ("Model does not explicitly define __unicode__ (%s)",
+                      'model-no-explicit-unicode',
+                      "Django models should implement a __unicode__ method for string representation. "
+                      "A parent class of this model does, but ideally all models should be explicit.")
 }
 
 
@@ -102,12 +102,12 @@ def visit_classdef(self, node):
                 if assigned.callable():
                     return
 
-                self.add_message('E%s01' % BASE_ID, args=node.name, node=node)
+                self.add_message(f'E{BASE_ID}01', args=node.name, node=node)
                 return
 
             if isinstance(child, FunctionDef) and child.name == '__unicode__':
                 if PY3:
-                    self.add_message('W%s02' % BASE_ID, args=node.name, node=node)
+                    self.add_message(f'W{BASE_ID}02', args=node.name, node=node)
                 return
 
         # if we get here, then we have no __unicode__ method directly on the class itself
@@ -117,7 +117,7 @@ def visit_classdef(self, node):
             if method.parent != node and _is_unicode_or_str_in_python_2_compatibility(method):
                 # this happens if a parent declares the unicode method but
                 # this node does not
-                self.add_message('W%s03' % BASE_ID, args=node.name, node=node)
+                self.add_message(f'W{BASE_ID}03', args=node.name, node=node)
                 return
 
         # if the Django compatibility decorator is used then we don't emit a warning
@@ -128,4 +128,4 @@ def visit_classdef(self, node):
         if PY3:
             return
 
-        self.add_message('W%s01' % BASE_ID, args=node.name, node=node)
+        self.add_message(f'W{BASE_ID}01', args=node.name, node=node)
diff --git a/pylint_django/tests/input/external_factory_boy_noerror.py b/pylint_django/tests/input/external_factory_boy_noerror.py
@@ -22,14 +22,14 @@ class AuthorFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = 'Author'
 
-    name = factory.Sequence(lambda n: 'Author %d' % n)
+    name = factory.Sequence(lambda n: f'Author {n}')
 
 
 class BookFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = 'Book'
 
-    title = factory.Sequence(lambda n: 'Book %d' % n)
+    title = factory.Sequence(lambda n: f'Book {n}')
     author = factory.SubFactory(AuthorFactory)
     reviewer = factory.LazyFunction(Author.objects.first())
 
diff --git a/pylint_django/tests/input/func_noerror_foreign_key_attributes.py b/pylint_django/tests/input/func_noerror_foreign_key_attributes.py
@@ -16,6 +16,6 @@ class OtherModel(models.Model):
     elsething = models.OneToOneField(SomeModel, on_delete=models.CASCADE)
 
     def something_doer(self):
-        part_a = '%s - %s' % (self.something.name, self.something.timestamp)
+        part_a = f'{self.something.name} - {self.something.timestamp}'
         part_b = self.elsething.name
         return part_a, part_b
diff --git a/pylint_django/transforms/__init__.py b/pylint_django/transforms/__init__.py
@@ -27,9 +27,10 @@ def fake_module_builder():
             http://pylint.pycqa.org/projects/astroid/en/latest/extending.html?highlight=MANAGER#module-extender-transforms
         """
         transforms_dir = os.path.join(os.path.dirname(__file__), 'transforms')
-        fake_module_path = os.path.join(transforms_dir, '%s.py' % re.sub(r'\.', '_', package_name))
+        transformed_name = re.sub(r'\.', '_', package_name)
+        fake_module_path = os.path.join(transforms_dir, f'{transformed_name}.py')
 
-        with open(fake_module_path) as modulefile:
+        with open(fake_module_path, encoding='utf-8') as modulefile:
             fake_module = modulefile.read()
 
         return astroid.builder.AstroidBuilder(astroid.MANAGER).string_build(fake_module)
diff --git a/setup.py b/setup.py
@@ -4,7 +4,9 @@
 """
 from setuptools import setup, find_packages
 
-LONG_DESCRIPTION = open('README.rst').read() + "\n" + open('CHANGELOG.rst').read()
+with open('README.rst', encoding='utf-8') as readme, \
+     open('CHANGELOG.rst', encoding='utf-8') as changelog:
+    LONG_DESCRIPTION = readme.read() + "\n" + changelog.read()
 
 setup(
     name='pylint-django',

Original file line number	Diff line number	Diff line change
`@@ -273,8 +273,8 @@`
`273`	`273`	`VIEW_ATTRS = {`
`274`	`274`	`(`
`275`	`275`	`(`
`276`		`- '{}.{}'.format(cls.__module__, cls.__name__),`
`277`		`- '.{}'.format(cls.__name__)`
	`276`	`+ f'{cls.__module__}.{cls.__name__}',`
	`277`	`+ f'.{cls.__name__}',`
`278`	`278`	`),`
`279`	`279`	`tuple(cls.__dict__.keys())`
`280`	`280`	`) for cls in (`