Keep the original message name

Author: CarliJoy

ChangeLog

@@ -14,7 +14,7 @@ Release date: TBA
 
   Closes #5588
 
-* Renamed  ``non-ascii-name`` to ``non-ascii-identifier`` and rewrote the checker.
+* Rewrote checker for ``non-ascii-name``.
    It now ensures __all__ Python names are ASCII and also properly
    checks the names of imports (``non-ascii-module-import``) as
    well as file names (``non-ascii-file-name``) and emits their respective new warnings.

doc/whatsnew/2.13.rst

@@ -63,13 +63,13 @@ class NonAsciiNamesChecker(
     msgs = {
         "C2401": (
             '%s name "%s" contains a non-ASCII character, consider renaming it.',
-            "non-ascii-identifier",
+            "non-ascii-name",
             (
                 "Used when the name contains at least one non-ASCII unicode character. "
                 "See https://www.python.org/dev/peps/pep-0672/#confusable-characters-in-identifiers"
                 " for a background why this could be bad."
             ),
-            {"old_names": [("C0144", "non-ascii-name")]},
+            {"old_names": [("C0144", "old-non-ascii-name")]},
         ),
         # First %s will always be "file"
         "W2402": (

pylint/checkers/non_ascii_names.py

@@ -1,6 +1,6 @@
 """ Tests for non-ascii-name checker. """
 
-áéíóú = 4444 # [non-ascii-identifier]
+áéíóú = 4444 # [non-ascii-name]
 
-def úóíéá(): # [non-ascii-identifier]
+def úóíéá(): # [non-ascii-name]
     """yo"""

tests/functional/n/non/non_ascii_name.py

@@ -1,2 +1,2 @@
-non-ascii-identifier:3:0:3:10::"Variable name ""áéíóú"" contains a non-ASCII character, consider renaming it.":HIGH
-non-ascii-identifier:5:0:6:12:úóíéá:"Function name ""úóíéá"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:3:0:3:10::"Variable name ""áéíóú"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:5:0:6:12:úóíéá:"Function name ""úóíéá"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non/non_ascii_name.txt

@@ -1,4 +1,4 @@
 """Assigment Expression as defined in https://www.python.org/dev/peps/pep-0572/"""
 
-if (loł := __name__) == "__main__":   # [non-ascii-identifier]
+if (loł := __name__) == "__main__":   # [non-ascii-name]
     print(loł)

tests/functional/n/non_ascii_name/non_ascii_name_assignment_expressions.py

@@ -1 +1 @@
-non-ascii-identifier:3:4:3:8::"Variable name ""loł"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:3:4:3:8::"Variable name ""loł"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_assignment_expressions.txt

@@ -0,0 +1,19 @@
+"""
+Ensure that also decorator calls caught correctly
+Column and line not correctly detected with Python 3.8, so we
+skip it and only test versions after that.
+"""
+
+
+def decoractor_func(*args, **kwargs):
+    """A docstring"""
+    return lambda x: f"Foobar {args} {kwargs}"
+
+
+@decoractor_func(
+    aaaaaaaaaaaaaaaaaaalllllllooooooooooooonnngggggggggglllline=1,
+    normal=2,
+    fåling=3,  # [non-ascii-name]
+)
+def a_function():
+    """A docstring"""

tests/functional/n/non_ascii_name/non_ascii_name_decorator.py

@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver=3.9

tests/functional/n/non_ascii_name/non_ascii_name_decorator.rc

@@ -0,0 +1 @@
+non-ascii-name:14:4:14:13:a_function:"Argument name ""fåling"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_decorator.txt

@@ -5,7 +5,7 @@
 
 def main():
     """main func"""
-    # +2: [non-ascii-identifier]
+    # +2: [non-ascii-name]
     a_variable = ""
     for łol in os.listdir("."):
         # Usage should not raise a second error

tests/functional/n/non_ascii_name/non_ascii_name_for_loop.py

@@ -1 +1 @@
-non-ascii-identifier:10:8:10:12:main:"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:10:8:10:12:main:"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_for_loop.txt

@@ -7,7 +7,7 @@ def sayHello():
     print("Hello, World!")
 
 
-# +3: [non-ascii-identifier]
+# +3: [non-ascii-name]
 
 
 def sayНello():

tests/functional/n/non_ascii_name/non_ascii_name_function.py

@@ -1 +1 @@
-non-ascii-identifier:13:0:15:28:sayНello:"Function name ""sayНello"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:13:0:15:28:sayНello:"Function name ""sayНello"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_function.txt

@@ -8,7 +8,7 @@
 def okay(
     just_some_thing_long_again: str,
     lol_very_long_argument: str,
-    łol: str,  # [non-ascii-identifier]
+    łol: str,  # [non-ascii-name]
 ) -> bool:
     """Be okay, yeah?"""
     # Usage should not raise a second error
@@ -20,5 +20,5 @@ def okay(
 okay(
     "A          VVVVVVVEEEERRRRRRRRRRYYYYYYYYYY    LONG TIME               ",
     lol_very_long_argument="a",
-    łol="b",  # [non-ascii-identifier]
+    łol="b",  # [non-ascii-name]
 )

tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.py

@@ -1,2 +1,2 @@
-non-ascii-identifier:11:4:11:13:okay:"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
-non-ascii-identifier:23:0:None:None::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:11:4:11:13:okay:"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:23:0:None:None::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.txt

@@ -9,7 +9,7 @@
 def okay(
     just_some_thing_long_again: str,
     lol_very_long_argument: str,
-    łol: str,  # [non-ascii-identifier]
+    łol: str,  # [non-ascii-name]
 ) -> bool:
     """Be okay, yeah?"""
     # Usage should not raise a second error
@@ -21,5 +21,5 @@ def okay(
 okay(
     "A          VVVVVVVEEEERRRRRRRRRRYYYYYYYYYY    LONG TIME               ",
     lol_very_long_argument="a",
-    łol="b",  # [non-ascii-identifier]
+    łol="b",  # [non-ascii-name]
 )

tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.py

@@ -1,2 +1,2 @@
-non-ascii-identifier:12:4:12:13:okay:"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
-non-ascii-identifier:24:4:24:12::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:12:4:12:13:okay:"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:24:4:24:12::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.txt

@@ -4,5 +4,5 @@
 
 foo = [
     f"{łol}                                                                       "
-    for łol in os.listdir(".")  # [non-ascii-identifier]
+    for łol in os.listdir(".")  # [non-ascii-name]
 ]

tests/functional/n/non_ascii_name/non_ascii_name_inline_var.py

@@ -1 +1 @@
-non-ascii-identifier:7:8:7:12::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:7:8:7:12::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_inline_var.txt

@@ -13,5 +13,5 @@ def okay(**kwargs):
 okay(
     a_long_attribute_that_is_very_okay=1,
     b_belongs_to_yet_another_okay_attributed=2,
-    łol=3,  # [non-ascii-identifier]
+    łol=3,  # [non-ascii-name]
 )

tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.py

@@ -1 +1 @@
-non-ascii-identifier:16:0:None:None::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:16:0:None:None::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.txt

@@ -14,5 +14,5 @@ def okay(**kwargs):
 okay(
     a_long_attribute_that_is_very_okay=1,
     b_belongs_to_yet_another_okay_attributed=2,
-    łol=3,  # [non-ascii-identifier]
+    łol=3,  # [non-ascii-name]
 )

tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.py

@@ -1 +1 @@
-non-ascii-identifier:17:4:17:10::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:17:4:17:10::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.txt

@@ -3,7 +3,7 @@
 
 def okay():
     """docstring"""
-    łol = "foo"  # [non-ascii-identifier]
+    łol = "foo"  # [non-ascii-name]
     # Usage should not raise a second error
     baring = łol
     print(baring)

tests/functional/n/non_ascii_name/non_ascii_name_local.py

@@ -1 +1 @@
-non-ascii-identifier:6:4:6:8:okay:"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:6:4:6:8:okay:"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_local.txt

@@ -6,14 +6,14 @@
 
 def name(
     some_thing_long_but_okay,
-    not_okay_łol,  # [non-ascii-identifier]
-    not_okay_defaułt=None,  # [non-ascii-identifier]
+    not_okay_łol,  # [non-ascii-name]
+    not_okay_defaułt=None,  # [non-ascii-name]
     /,
     p_or_kw_okay=None,
-    p_or_kw_not_økay=None,  # [non-ascii-identifier]
+    p_or_kw_not_økay=None,  # [non-ascii-name]
     *,
     kw_arg_okay,
-    kw_arg_not_økay,  # [non-ascii-identifier]
+    kw_arg_not_økay,  # [non-ascii-name]
 ):
     """
     Do something!

tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.py

@@ -1,4 +1,4 @@
-non-ascii-identifier:9:4:9:17:name:"Argument name ""not_okay_łol"" contains a non-ASCII character, consider renaming it.":HIGH
-non-ascii-identifier:10:4:10:21:name:"Argument name ""not_okay_defaułt"" contains a non-ASCII character, consider renaming it.":HIGH
-non-ascii-identifier:13:4:13:21:name:"Argument name ""p_or_kw_not_økay"" contains a non-ASCII character, consider renaming it.":HIGH
-non-ascii-identifier:16:4:16:20:name:"Argument name ""kw_arg_not_økay"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:9:4:9:17:name:"Argument name ""not_okay_łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:10:4:10:21:name:"Argument name ""not_okay_defaułt"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:13:4:13:21:name:"Argument name ""p_or_kw_not_økay"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:16:4:16:20:name:"Argument name ""kw_arg_not_økay"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.txt

@@ -8,7 +8,7 @@ def public(self):
         """Say it load"""
 
     @staticmethod
-    def umlaut_ä():  # [non-ascii-identifier]
+    def umlaut_ä():  # [non-ascii-name]
         """Say ä"""
         return "ä"
 

tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.py

@@ -1 +1 @@
-non-ascii-identifier:11:4:13:19:OkayClass.umlaut_ä:"Function name ""umlaut_ä"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:11:4:13:19:OkayClass.umlaut_ä:"Function name ""umlaut_ä"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.txt

@@ -5,7 +5,7 @@
 
 try:
     raise AttributeError("Test")
-    # +1: [non-ascii-identifier]
+    # +1: [non-ascii-name]
 except AttributeError as łol:
     # Usage should not raise a second error
     foo = łol

tests/functional/n/non_ascii_name/non_ascii_name_try_except.py

@@ -1 +1 @@
-non-ascii-identifier:9:0:11:14::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:9:0:11:14::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_try_except.txt

@@ -4,6 +4,6 @@
 # pylint: disable=invalid-name
 
 # Test invalid variable name
-łol = "Foobar"  # [non-ascii-identifier]
+łol = "Foobar"  # [non-ascii-name]
 # Usage should not raise a second error
-łol += "-"  # [non-ascii-identifier]
+łol += "-"  # [non-ascii-name]

tests/functional/n/non_ascii_name/non_ascii_name_variable.py

@@ -1,2 +1,2 @@
-non-ascii-identifier:7:0:7:4::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
-non-ascii-identifier:9:0:9:4::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:7:0:7:4::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:9:0:9:4::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name/non_ascii_name_variable.txt

@@ -2,7 +2,7 @@
 # pylint: disable=too-few-public-methods
 
 
-class НoldIt:  # [non-ascii-identifier]
+class НoldIt:  # [non-ascii-name]
     """nice classs"""
 
     def public(self):

tests/functional/n/non_ascii_name_class/non_ascii_name_class.py

@@ -1 +1 @@
-non-ascii-identifier:5:0:10:19:НoldIt:"Class name ""НoldIt"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:5:0:10:19:НoldIt:"Class name ""НoldIt"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name_class/non_ascii_name_class.txt

@@ -9,7 +9,7 @@ def public(self):
         print(self)
 
     def __init__(self):
-        self.łoopback = "invalid"  # [non-ascii-identifier]
+        self.łoopback = "invalid"  # [non-ascii-name]
 
     def foobar(self):
         """do something"""

tests/functional/n/non_ascii_name_class/non_ascii_name_class_attribute.py

@@ -1 +1 @@
-non-ascii-identifier:12:8:12:22:OkayIsh.__init__:"Attribute name ""łoopback"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:12:8:12:22:OkayIsh.__init__:"Attribute name ""łoopback"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name_class/non_ascii_name_class_attribute.txt

@@ -3,7 +3,7 @@
 
 class OkayIsh:
     """Class docstring"""
-    ŁOOPBACK = "invalid"  # [non-ascii-identifier]
+    ŁOOPBACK = "invalid"  # [non-ascii-name]
 
 
     def more_public(self):

tests/functional/n/non_ascii_name_class/non_ascii_name_class_constant.py

@@ -1 +1 @@
-non-ascii-identifier:6:4:6:13:OkayIsh:"Attribute name ""ŁOOPBACK"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:6:4:6:13:OkayIsh:"Attribute name ""ŁOOPBACK"" contains a non-ASCII character, consider renaming it.":HIGH

tests/functional/n/non_ascii_name_class/non_ascii_name_class_constant.txt

@@ -9,7 +9,7 @@ def public(self):
         print(self)
 
     @classmethod
-    def umlaut_ä(cls):  # [non-ascii-identifier]
+    def umlaut_ä(cls):  # [non-ascii-name]
         """do something"""
         return "ä"
 

tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.py

@@ -1 +1 @@
-non-ascii-identifier:12:4:14:19:OkayClass.umlaut_ä:"Function name ""umlaut_ä"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:12:4:14:19:OkayClass.umlaut_ä:"Function name ""umlaut_ä"" contains a non-ASCII character, consider renaming it.":HIGH