Fixing lint errors

Author: fhightower

d8s_python/ast_data.py

@@ -7,7 +7,7 @@
 # TODO: all of these functions where code_text is given should also be able to read a file at a given path (?)
 
 
-def _python_ast_exception_name(node: Union[ast.Raise, ast.ExceptHandler]) -> str:
+def _python_ast_exception_name(node: Union[ast.Raise, ast.ExceptHandler]) -> str:  # noqa: CCR001
     """."""
     if hasattr(node, 'exc') and node.exc:  # this handles ast.Raise nodes
         if hasattr(
@@ -41,38 +41,34 @@ def _python_ast_exception_name(node: Union[ast.Raise, ast.ExceptHandler]) -> str
 
 def python_ast_raise_name(node: ast.Raise) -> Optional[str]:
     """Get the name of the exception raise by the given ast.Raise object."""
-    if isinstance(node, ast.Raise):
-        return _python_ast_exception_name(node)
+    return _python_ast_exception_name(node)
 
 
 def python_ast_exception_handler_exceptions_handled(handler: ast.ExceptHandler) -> Optional[Iterable[str]]:
     """Return all of the exceptions handled by the given exception handler."""
-    if isinstance(handler, ast.ExceptHandler):
-        handler_has_multiple_exceptions = handler.type and hasattr(handler.type, 'elts')
-        if handler_has_multiple_exceptions:
-            yield from (_python_ast_exception_name(i) for i in handler.type.elts)
-        else:
-            exception_name = _python_ast_exception_name(handler)
-            if exception_name:
-                yield exception_name
+    handler_has_multiple_exceptions = handler.type and hasattr(handler.type, 'elts')
+    if handler_has_multiple_exceptions:
+        yield from (_python_ast_exception_name(i) for i in handler.type.elts)
+    else:
+        exception_name = _python_ast_exception_name(handler)
+        if exception_name:
+            yield exception_name
 
 
 def python_ast_exception_handler_exceptions_raised(handler: ast.ExceptHandler) -> Optional[Iterable[str]]:
     """Return the exception raised by the given exception handler."""
-    if isinstance(handler, ast.ExceptHandler):
-        raise_nodes = list(python_ast_objects_of_type(handler, ast.Raise))
-        if any(raise_nodes):
-            exceptions_names = list(map(python_ast_raise_name, raise_nodes))
-            for name in exceptions_names:
-                if name and name == handler.name:
-                    exceptions_names = iterable_replace(
-                        exceptions_names, name, python_ast_exception_handler_exceptions_handled(handler)
-                    )
-                elif name is None:
-                    exceptions_names = iterable_replace(
-                        exceptions_names, name, python_ast_exception_handler_exceptions_handled(handler)
-                    )
-            yield from more_itertools.collapse(exceptions_names, base_type=str)
+    raise_nodes = python_ast_objects_of_type(handler, ast.Raise)
+    exceptions_names = list(map(python_ast_raise_name, raise_nodes))
+    for name in exceptions_names:
+        if name and name == handler.name:
+            exceptions_names = iterable_replace(
+                exceptions_names, name, python_ast_exception_handler_exceptions_handled(handler)
+            )
+        elif name is None:
+            exceptions_names = iterable_replace(
+                exceptions_names, name, python_ast_exception_handler_exceptions_handled(handler)
+            )
+    yield from more_itertools.collapse(exceptions_names, base_type=str)
 
 
 def python_exceptions_handled(code_text: str) -> Iterable[str]:
@@ -145,7 +141,7 @@ def _python_ast_clean(code_text: str) -> str:
 
 
 # TODO: have a decorator to parse a first argument that is a string
-def python_ast_objects_of_type(
+def python_ast_objects_of_type(  # noqa: CCR001
     code_text_or_ast_object: Union[str, object], ast_type: type, *, recursive_search: bool = True
 ) -> Iterable[object]:
     """Return all of the ast objects of the given ast_type in the code_text_or_ast_object."""

d8s_python/python_data.py

@@ -94,7 +94,7 @@ def python_clean(code_text: str) -> str:
     return code_text
 
 
-def python_function_blocks(
+def python_function_blocks(  # noqa: CCR001
     code_text: str, *, ignore_private_functions: bool = False, ignore_nested_functions: bool = False
 ) -> List[str]:
     """Find the code (as a string) for every function in the given code_text."""
@@ -206,7 +206,7 @@ def python_keywords() -> List[str]:
 
 
 # @decorators.map_first_arg
-def python_object_properties_enumerate(
+def python_object_properties_enumerate(  # noqa: CCR001
     python_object: Any, *, run_methods: bool = True, internal_properties: bool = True
 ) -> None:
     """Enumerate and print out the properties of the given object."""
@@ -248,7 +248,7 @@ def python_copy_shallow(python_object: Any) -> Any:
 
 
 # @decorators.map_first_arg
-def python_file_names(path: str, *, exclude_tests: bool = False) -> List[str]:
+def python_file_names(path: str, *, exclude_tests: bool = False) -> List[str]:  # noqa: CCR001
     """Find all python files in the given directory."""
     from d8s_file_system import directory_file_names_matching