skylos 2.2.2__tar.gz → 2.2.3__tar.gz

{skylos-2.2.2 → skylos-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skylos
-Version: 2.2.2
+Version: 2.2.3
 Summary: A static analysis tool for Python codebases
 Author-email: oha <aaronoh2015@gmail.com>
 Requires-Python: >=3.9

{skylos-2.2.2 → skylos-2.2.3}/README.md

@@ -253,6 +253,7 @@ Options:
   --json                       Output raw JSON instead of formatted text  
   -o, --output FILE            Write output to file instead of stdout
   -v, --verbose                Enable verbose output
+  --version                    Checks version
   -i, --interactive            Interactively select items to remove
   --dry-run                    Show what would be removed without modifying files
   --exclude-folder FOLDER      Exclude a folder from analysis (can be used multiple times)
@@ -290,7 +291,7 @@ Pick **one** (or use **both**)
 ## .pre-commit-config.yaml
 repos:
   - repo: https://github.com/duriantaco/skylos
-    rev: v2.2.2
+    rev: v2.2.3
     hooks:
       - id: skylos-scan
         name: skylos report
@@ -340,7 +341,7 @@ repos:
         entry: python -m skylos.cli
         pass_filenames: false
         require_serial: true
-        additional_dependencies: [skylos==2.2.2]
+        additional_dependencies: [skylos==2.2.3]
         args: [".", "--output", "report.json", "--confidence", "70"]
 
       - id: skylos-fail-on-findings

{skylos-2.2.2 → skylos-2.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "skylos"
-version = "2.2.2"
+version = "2.2.3"
 requires-python = ">=3.9"
 description = "A static analysis tool for Python codebases"
 authors = [{name = "oha", email = "aaronoh2015@gmail.com"}]

{skylos-2.2.2 → skylos-2.2.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="skylos",
-    version="2.2.2",
+    version="2.2.3",
     packages=find_packages(),
     python_requires=">=3.9",
     install_requires=[

{skylos-2.2.2 → skylos-2.2.3}/skylos/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.2"
+__version__ = "2.2.3"
 
 def analyze(*args, **kwargs):
     from .analyzer import analyze as _analyze

{skylos-2.2.2 → skylos-2.2.3}/skylos/codemods.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 import libcst as cst
 from libcst.metadata import PositionProvider
+from libcst.helpers import get_full_name_for_node
 
 class _CommentOutBlock(cst.CSTTransformer):
 
@@ -31,14 +32,16 @@ class _CommentOutFunctionAtLine(_CommentOutBlock):
         return pos and pos.start.line == self.target_line
 
     def leave_FunctionDef(self, orig: cst.FunctionDef, updated: cst.FunctionDef):
-        if self._is_target(orig) and (orig.name.value == self.func_name):
+        target = self.func_name.split(".")[-1]
+        if self._is_target(orig) and (orig.name.value == target):
             self.changed = True
             pos = self.get_metadata(PositionProvider, orig)
             return cst.FlattenSentinel(self._comment_block(pos.start.line, pos.end.line))
         return updated
 
     def leave_AsyncFunctionDef(self, orig: cst.AsyncFunctionDef, updated: cst.AsyncFunctionDef):
-        if self._is_target(orig) and (orig.name.value == self.func_name):
+        target = self.func_name.split(".")[-1] 
+        if self._is_target(orig) and (orig.name.value == target):
             self.changed = True
             pos = self.get_metadata(PositionProvider, orig)
             return cst.FlattenSentinel(self._comment_block(pos.start.line, pos.end.line))
@@ -73,7 +76,9 @@ class _CommentOutImportAtLine(_CommentOutBlock):
         removed_for_comment= []
         for alias in list(aliases):
             bound = _bound_name_for_import_alias(alias)
-            if bound == self.target_name:
+            name_code = get_full_name_for_node(alias.name)
+            tail = name_code.split(".")[-1]
+            if self.target_name in (bound, tail):
                 self.changed = True
                 removed_for_comment.append(self._render_single_alias_text(head, alias, is_from))
             else:
@@ -175,7 +180,9 @@ class _RemoveImportAtLine(cst.CSTTransformer):
         kept = []
         for alias in aliases:
             bound = _bound_name_for_import_alias(alias)
-            if bound == self.target_name:
+            name_code = get_full_name_for_node(alias.name) or ""
+            tail = name_code.split(".")[-1]
+            if self.target_name in (bound, tail):
                 self.changed = True
                 continue
             kept.append(alias)
@@ -213,13 +220,15 @@ class _RemoveFunctionAtLine(cst.CSTTransformer):
         return pos and pos.start.line == self.target_line
 
     def leave_FunctionDef(self, orig: cst.FunctionDef, updated: cst.FunctionDef):
-        if self._is_target(orig) and (orig.name.value == self.func_name):
+        target = self.func_name.split(".")[-1]
+        if self._is_target(orig) and (orig.name.value == target):
             self.changed = True
             return cst.RemoveFromParent()
         return updated
 
     def leave_AsyncFunctionDef(self, orig: cst.AsyncFunctionDef, updated: cst.AsyncFunctionDef):
-        if self._is_target(orig) and (orig.name.value == self.func_name):
+        target = self.func_name.split(".")[-1]
+        if self._is_target(orig) and (orig.name.value == target):
             self.changed = True
             return cst.RemoveFromParent()
 

{skylos-2.2.2 → skylos-2.2.3}/skylos/rules/secrets.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 import re, ast
 from math import log2
-from typing import Dict, Any, Iterable, List, Optional
 
 __all__ = ["scan_ctx"]
 

{skylos-2.2.2 → skylos-2.2.3}/skylos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skylos
-Version: 2.2.2
+Version: 2.2.3
 Summary: A static analysis tool for Python codebases
 Author-email: oha <aaronoh2015@gmail.com>
 Requires-Python: >=3.9