skylos 2.2.2__py3-none-any.whl → 2.2.3__py3-none-any.whl

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/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/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.dist-info → skylos-2.2.3.dist-info}/METADATA

@@ -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.dist-info → skylos-2.2.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
-skylos/__init__.py,sha256=C4oz_FAjQTq_0XiSSxpDnngdL9YlWLpuam7NNvB_vPs,229
+skylos/__init__.py,sha256=cFxP_uUY-acB9iRs7SE3ccyWiX6v8mI-mJo9bfhC2aU,229
 skylos/analyzer.py,sha256=G_8pw7GmChATc5h5XXij2pcHirhh_5G9Y8dlAC1dx38,16735
 skylos/cli.py,sha256=DOV6nwPbi5zh-OJ3wXjIaPxCfXRtiPMNqo9Zp2nvDBA,19475
-skylos/codemods.py,sha256=QdOwtbE2PpLsgCqpeScFg-pCfcpfHw9hFu-0WKKKBQg,9084
+skylos/codemods.py,sha256=-1ehjFLc1MmtK3inoSZF_RyBNWF7XZSOq2KH5_MDzuA,9519
 skylos/constants.py,sha256=kU-2FKQAV-ju4rYw62Tw25uRvqauzjZFUqtvGWaI6Es,1571
 skylos/server.py,sha256=oHuevjdDFvJVbvpTtCDjSLOJ6Zy1jL4BYLYV4VFNMXs,15903
 skylos/visitor.py,sha256=o_2JxjXKXAcWLQr8nmoatGAz2EhBk225qE_piHf3hDg,20458
 skylos/rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-skylos/rules/secrets.py,sha256=FD7cXZ4_Zfg_Si1qFXLVK-5OIX1HXtCr_yJM0OlRsbI,9425
+skylos/rules/secrets.py,sha256=_cvi-NETScQWMPexb8R2_QtgTRMQGbb09BT1Os246DA,9370
 skylos/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 skylos/visitors/framework_aware.py,sha256=eX4oU0jQwDWejkkW4kjRNctre27sVLHK1CTDDiqPqRw,13054
 skylos/visitors/test_aware.py,sha256=kxYoMG2m02kbMlxtFOM-MWJO8qqxHviP9HgAMbKRfvU,2304
@@ -33,8 +33,8 @@ test/sample_repo/sample_repo/commands.py,sha256=b6gQ9YDabt2yyfqGbOpLo0osF7wya8O4
 test/sample_repo/sample_repo/models.py,sha256=xXIg3pToEZwKuUCmKX2vTlCF_VeFA0yZlvlBVPIy5Qw,3320
 test/sample_repo/sample_repo/routes.py,sha256=8yITrt55BwS01G7nWdESdx8LuxmReqop1zrGUKPeLi8,2475
 test/sample_repo/sample_repo/utils.py,sha256=S56hEYh8wkzwsD260MvQcmUFOkw2EjFU27nMLFE6G2k,1103
-skylos-2.2.2.dist-info/METADATA,sha256=LfA3i21DFqm9HGGJLXEkSwkK1Adv-58LPnIAmwguvwQ,314
-skylos-2.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skylos-2.2.2.dist-info/entry_points.txt,sha256=zzRpN2ByznlQoLeuLolS_TFNYSQxUGBL1EXQsAd6bIA,43
-skylos-2.2.2.dist-info/top_level.txt,sha256=f8GA_7KwfaEopPMP8-EXDQXaqd4IbsOQPakZy01LkdQ,12
-skylos-2.2.2.dist-info/RECORD,,
+skylos-2.2.3.dist-info/METADATA,sha256=ug19tHc6winuwwnlmWqv87j18KfrnAKs14KvFRA-ivo,314
+skylos-2.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skylos-2.2.3.dist-info/entry_points.txt,sha256=zzRpN2ByznlQoLeuLolS_TFNYSQxUGBL1EXQsAd6bIA,43
+skylos-2.2.3.dist-info/top_level.txt,sha256=f8GA_7KwfaEopPMP8-EXDQXaqd4IbsOQPakZy01LkdQ,12
+skylos-2.2.3.dist-info/RECORD,,