Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/Naming/NamingStyleChecker.py	Sun Jan 17 13:53:08 2021 +0100
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/Naming/NamingStyleChecker.py	Mon Feb 01 10:38:16 2021 +0100
@@ -11,7 +11,6 @@
 import ast
 import re
 import os
-import sys
 
 try:
     ast.AsyncFunctionDef    # __IGNORE_EXCEPTION__
@@ -94,8 +93,8 @@
         Private method to scan the given AST tree.
         
         @param node AST tree node to scan
-        @return tuple giving line number, offset within line, code and
-            checker function
+        @yield tuple giving line number, offset within line and error code
+        @ytype tuple of (int, int, str)
         """
         for error in self.__visitNode(node):
             yield error
@@ -110,8 +109,8 @@
         Private method to inspect the given AST node.
         
         @param node AST tree node to inspect
-        @return tuple giving line number, offset within line, code and
-            checker function
+        @yield tuple giving line number, offset within line and error code
+        @ytype tuple of (int, int, str)
         """
         if isinstance(node, ast.ClassDef):
             self.__tagClassFunctions(node)
@@ -230,8 +229,8 @@
         
         @param node AST note to check
         @param parents list of parent nodes
-        @return tuple giving line number, offset within line and error code
-            (integer, integer, string)
+        @yield tuple giving line number, offset within line and error code
+        @ytype tuple of (int, int, str)
         """
         if isinstance(node, (ast.ClassDef, ast.FunctionDef,
                              ast.AsyncFunctionDef)):
@@ -279,8 +278,8 @@
         
         @param node AST note to check
         @param parents list of parent nodes
-        @return tuple giving line number, offset within line and error code
-            (integer, integer, string)
+        @yield tuple giving line number, offset within line and error code
+        @ytype tuple of (int, int, str)
         """
         if not self.CamelcaseRegexp.match(node.name):
             yield self.__error(node, "N801")
@@ -298,8 +297,8 @@
         
         @param node AST note to check
         @param parents list of parent nodes
-        @return tuple giving line number, offset within line and error code
-            (integer, integer, string)
+        @yield tuple giving line number, offset within line and error code
+        @ytype tuple of (int, int, str)
         """
         functionType = getattr(node, "function_type", "function")
         name = node.name
@@ -320,23 +319,17 @@
         
         @param node AST note to check
         @param parents list of parent nodes
-        @return tuple giving line number, offset within line and error code
-            (integer, integer, string)
+        @yield tuple giving line number, offset within line and error code
+        @ytype tuple of (int, int, str)
         """
         if node.args.kwarg is not None:
-            if sys.version_info >= (3, 4):
-                kwarg = node.args.kwarg.arg
-            else:
-                kwarg = node.args.kwarg
+            kwarg = node.args.kwarg.arg
             if not self.LowercaseRegex.match(kwarg):
                 yield self.__error(node, "N803")
                 return
         
         if node.args.vararg is not None:
-            if sys.version_info >= (3, 4):
-                vararg = node.args.vararg.arg
-            else:
-                vararg = node.args.vararg
+            vararg = node.args.vararg.arg
             if not self.LowercaseRegex.match(vararg):
                 yield self.__error(node, "N803")
                 return
@@ -373,8 +366,8 @@
         
         @param node AST note to check
         @param parents list of parent nodes
-        @return tuple giving line number, offset within line and error code
-            (integer, integer, string)
+        @yield tuple giving line number, offset within line and error code
+        @ytype tuple of (int, int, str)
         """
         for parentFunc in reversed(parents):
             if isinstance(parentFunc, ast.ClassDef):
@@ -399,8 +392,8 @@
         
         @param node AST note to check
         @param parents list of parent nodes
-        @return tuple giving line number, offset within line and error code
-            (integer, integer, string)
+        @yield tuple giving line number, offset within line and error code
+        @ytype tuple of (int, int, str)
         """
         if self.__filename:
             moduleName = os.path.splitext(os.path.basename(self.__filename))[0]
@@ -422,8 +415,8 @@
         
         @param node AST note to check
         @param parents list of parent nodes
-        @return tuple giving line number, offset within line and error code
-            (integer, integer, string)
+        @yield tuple giving line number, offset within line and error code
+        @ytype tuple of (int, int, str)
         """
         for name in node.names:
             if not name.asname: