Drop python 2 support using the PY3 checks

Author: Pierre-Sassoulas

CHANGELOG.rst

@@ -11,6 +11,8 @@ Other
 - CI now tests against Django 5.2
 - CI now tests against python 3.13
 - CI now tests against python 3.14
+- model-missing-unicode (W5101) could not be emitted anymore as it was related
+  to python 2 and it was removed.
 
 
 Version 2.6.1

pylint_django/__pkginfo__.py

@@ -1,3 +1,3 @@
 """pkginfo."""
 
-BASE_ID = 51
+BASE_ID = 51  # Identifier for pylint-django messages

pylint_django/augmentations/__init__.py

@@ -24,7 +24,7 @@
 from pylint.checkers.variables import ScopeConsumer, VariablesChecker
 from pylint_plugin_utils import augment_visit, suppress_message
 
-from pylint_django.utils import PY3, node_is_subclass
+from pylint_django.utils import node_is_subclass
 
 # Note: it would have been nice to import the Manager object from Django and
 # get its attributes that way - and this used to be the method - but unfortunately
@@ -317,7 +317,7 @@ def ignore_import_warnings_for_related_fields(orig_method, self, node):
 
     new_things = {}
 
-    iterat = consumer.to_consume.items if PY3 else consumer.to_consume.iteritems
+    iterat = consumer.to_consume.items
     for name, stmts in iterat():
         if isinstance(stmts[0], ImportFrom):
             if any(n[0] in ("ForeignKey", "OneToOneField") for n in stmts[0].names):
@@ -363,7 +363,7 @@ class ModelB(models.Model):
     quack = False
 
     if node.attrname in MANAGER_ATTRS or node.attrname.endswith("_set"):
-        # if this is a X_set method, that's a pretty strong signal that this is the default
+        # if this is an X_set method, that's a pretty strong signal that this is the default
         # Django name, rather than one set by related_name
         quack = True
     # we will
@@ -651,7 +651,7 @@ def __call__(self, node):
 
 
 def is_model_view_subclass_method_shouldnt_be_function(node):
-    """Checks that node is a default http method (i.e get, post, put, and more) of the View class."""
+    """Checks that node is a default http method (i.e. get, post, put, and more) of the View class."""
     if node.name not in View.http_method_names:
         return False
 
@@ -672,8 +672,9 @@ def ignore_unused_argument_warnings_for_request(orig_method, self, stmt, name):
     """
     Ignore unused-argument warnings for function arguments named "request".
 
-    The signature of Django view functions require the request argument but it is okay if the request is not used.
-    This function should be used as a wrapper for the `VariablesChecker._is_name_ignored` method.
+    The signature of Django view functions require the request argument, but
+    it is okay if the request is not used. This function should be used as a
+    wrapper for the `VariablesChecker._is_name_ignored` method.
     """
     if name in ("request", "args", "kwargs"):
         return True

pylint_django/checkers/models.py

@@ -5,19 +5,14 @@
 from pylint.checkers.utils import only_required_for_messages
 
 from pylint_django.__pkginfo__ import BASE_ID
-from pylint_django.utils import PY3, node_is_subclass
+from pylint_django.utils import node_is_subclass
 
 MESSAGES = {
     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",
@@ -108,9 +103,7 @@ def visit_classdef(self, node):  # noqa: PLR0911
                 return
 
             if isinstance(child, FunctionDef) and child.name == "__unicode__":
-                if PY3:
-                    self.add_message(f"W{BASE_ID}02", args=node.name, node=node)
-                return
+                self.add_message(f"W{BASE_ID}02", args=node.name, node=node)
 
         # if we get here, then we have no __unicode__ method directly on the class itself
 
@@ -126,8 +119,4 @@ def visit_classdef(self, node):  # noqa: PLR0911
         # see https://github.com/pylint-dev/pylint-django/issues/10
         if _has_python_2_unicode_compatible_decorator(node):
             return
-
-        if PY3:
-            return
-
-        self.add_message(f"W{BASE_ID}01", args=node.name, node=node)
+        return

pylint_django/transforms/fields.py

@@ -1,7 +1,7 @@
 from astroid import MANAGER, AstroidImportError, inference_tip, nodes
 from astroid.nodes import scoped_nodes
 
-from pylint_django import compat, utils
+from pylint_django import compat
 
 _STR_FIELDS = (
     "CharField",
@@ -97,17 +97,11 @@ def apply_type_shim(cls, _context=None):  # pylint: disable=too-many-statements
             base_nodes = MANAGER.ast_from_module_name("psycopg2._range").lookup("Range")
     else:
         return iter([cls])
-
-    # XXX: for some reason, with python3, this particular line triggers a
-    # check in the StdlibChecker for deprecated methods; one of these nodes
-    # is an ImportFrom which has no qname() method, causing the checker
-    # to die...
-    if utils.PY3:
-        base_nodes = [_valid_base_node(n, _context) for n in base_nodes[1]]
-        base_nodes = [n for n in base_nodes if n]
-    else:
-        base_nodes = list(base_nodes[1])
-
+    # For some reason, this particular line triggers a check in the
+    # StdlibChecker for deprecated methods; one of these nodes is an
+    # ImportFrom which has no qname() method, causing the checker to die...
+    base_nodes = [_valid_base_node(n, _context) for n in base_nodes[1]]
+    base_nodes = [n for n in base_nodes if n]
     return iter([cls, *base_nodes])
 
 

pylint_django/utils.py

@@ -1,15 +1,11 @@
 """Utils."""
 
-import sys
-
 import astroid
 from astroid import Uninferable
 from astroid.bases import Instance
 from astroid.exceptions import InferenceError
 from astroid.nodes import ClassDef
 
-PY3 = sys.version_info >= (3, 0)  # TODO: pylint_django doesn't support Py2 any more
-
 
 def node_is_subclass(cls, *subclass_names):
     """Checks if cls node has parent with subclass_name."""