skylos 1.2.2__py3-none-any.whl → 2.0.0__py3-none-any.whl

skylos/visitor.py

@@ -7,22 +7,25 @@ DBG = bool(int(os.getenv("SKYLOS_DEBUG", "0")))
 log = logging.getLogger("Skylos")
 
 
-PYTHON_BUILTINS={"print","len","str","int","float","list","dict","set","tuple","range","open","super","object","type","enumerate","zip","map","filter","sorted","reversed","sum","min","max","all","any","next","iter","repr","chr","ord","bytes","bytearray","memoryview","format","round","abs","pow","divmod","complex","hash","id","bool","callable","getattr","setattr","delattr","hasattr","isinstance","issubclass","globals","locals","vars","dir","property","classmethod","staticmethod"}
-DYNAMIC_PATTERNS={"getattr","globals","eval","exec"}
+PYTHON_BUILTINS={"print", "len", "str", "int", "float", "list", "dict", "set", "tuple", "range", "open", 
+                 "super", "object", "type", "enumerate", "zip", "map", "filter", "sorted", "sum", "min", 
+                "next", "iter", "bytes", "bytearray", "format", "round", "abs", "complex", "hash", "id", "bool", "callable", 
+                "getattr", "max", "all", "any", "setattr", "hasattr", "isinstance", "globals", "locals", 
+                "vars", "dir" ,"property", "classmethod", "staticmethod"}
+DYNAMIC_PATTERNS={"getattr", "globals", "eval", "exec"}
 
 class Definition:
-    __slots__ = ('name', 'type', 'filename', 'line', 'simple_name', 'confidence', 'references', 'is_exported', 'in_init')
     
-    def __init__(self, n, t, f, l):
-        self.name = n
+    def __init__(self, name, t, filename, line):
+        self.name = name
         self.type = t
-        self.filename = f
-        self.line = l
-        self.simple_name = n.split('.')[-1]
+        self.filename = filename
+        self.line = line
+        self.simple_name = name.split('.')[-1]
         self.confidence = 100
         self.references = 0
         self.is_exported = False
-        self.in_init = "__init__.py" in str(f)
+        self.in_init = "__init__.py" in str(filename)
     
     def to_dict(self):
         if self.type == "method" and "." in self.name:
@@ -48,26 +51,30 @@ class Definition:
 
 class Visitor(ast.NodeVisitor):
     def __init__(self,mod,file):
-        self.mod=mod
-        self.file=file
-        self.defs=[]
-        self.refs=[]
-        self.cls=None
-        self.alias={}
-        self.dyn=set()
-        self.exports=set()
-        self.current_function_scope = []
-        self.current_function_params = []
-
-    def add_def(self,n,t,l):
-        if n not in{d.name for d in self.defs}:self.defs.append(Definition(n,t,self.file,l))
-
-    def add_ref(self,n):self.refs.append((n,self.file))
-
-    def qual(self,n):
-        if n in self.alias:return self.alias[n]
-        if n in PYTHON_BUILTINS:return n
-        return f"{self.mod}.{n}"if self.mod else n
+        self.mod= mod
+        self.file= file
+        self.defs= []
+        self.refs= []
+        self.cls= None
+        self.alias= {}
+        self.dyn= set()
+        self.exports= set()
+        self.current_function_scope= []
+        self.current_function_params= []
+
+    def add_def(self, name, t, line):
+        if name not in {d.name for d in self.defs}:
+            self.defs.append(Definition(name, t, self.file, line))
+
+    def add_ref(self, name):
+        self.refs.append((name, self.file))
+
+    def qual(self, name):
+        if name in self.alias:
+            return self.alias[name]
+        if name in PYTHON_BUILTINS:
+            return name
+        return f"{self.mod}.{name}" if self.mod else name
 
     def visit_annotation(self, node):
         if node is not None:
@@ -83,24 +90,23 @@ class Visitor(ast.NodeVisitor):
             return
 
         if DBG:
-            log.debug(f"[visitor] parsing string annotation {annotation_str!r} "
-                    f"in {self.filename}:{getattr(self, 'line', '?')}")
+            log.debug(f"parsing annotation: {annotation_str}")
+
 
         try:
             parsed = ast.parse(annotation_str, mode="eval")
             self.visit(parsed.body)
-        except Exception:
+        except:
             if DBG:
-                log.debug("[visitor] inner-annotation parse failed:\n" +
-                        traceback.format_exc())
-            # keep going but dont swallow symbol names:
+                if DBG: log.debug("annotation parse failed")
+            
             for tok in re.findall(r"[A-Za-z_][A-Za-z0-9_]*", annotation_str):
                 self.add_ref(tok)
 
-    def visit_Import(self,node):
+    def visit_Import(self, node):
         for a in node.names:
-            full=a.name
-            self.alias[a.asname or a.name.split(".")[-1]]=full
+            full= a.name
+            self.alias[a.asname or a.name.split(".")[-1]]= full
             self.add_def(full,"import",node.lineno)
 
     def visit_ImportFrom(self, node):
@@ -127,6 +133,7 @@ class Visitor(ast.NodeVisitor):
             self.visit_annotation(arg.annotation)
         for arg in args.posonlyargs:
             self.visit_annotation(arg.annotation)
+            
         for arg in args.kwonlyargs:
             self.visit_annotation(arg.annotation)
         if args.vararg:
@@ -143,11 +150,11 @@ class Visitor(ast.NodeVisitor):
         outer_scope_prefix = '.'.join(self.current_function_scope) + '.' if self.current_function_scope else ''
         
         if self.cls:
-            name_parts = [self.mod, self.cls, outer_scope_prefix + node.name]
+            name_parts= [self.mod, self.cls, outer_scope_prefix + node.name]
         else:
-            name_parts = [self.mod, outer_scope_prefix + node.name]
+            name_parts= [self.mod, outer_scope_prefix + node.name]
         
-        qualified_name = ".".join(filter(None, name_parts))
+        qualified_name= ".".join(filter(None, name_parts))
 
         self.add_def(qualified_name,"method"if self.cls else"function",node.lineno)
         
@@ -173,11 +180,11 @@ class Visitor(ast.NodeVisitor):
         self.current_function_scope.pop()
         self.current_function_params = old_params
         
-    visit_AsyncFunctionDef=visit_FunctionDef
+    visit_AsyncFunctionDef= visit_FunctionDef
 
-    def visit_ClassDef(self,node):
-        cname=f"{self.mod}.{node.name}"
-        self.add_def(cname,"class",node.lineno)
+    def visit_ClassDef(self, node):
+        cname =f"{self.mod}.{node.name}"
+        self.add_def(cname, "class",node.lineno)
         
         for base in node.bases:
             self.visit(base)
@@ -186,9 +193,13 @@ class Visitor(ast.NodeVisitor):
         for decorator in node.decorator_list:
             self.visit(decorator)
         
-        prev=self.cls;self.cls=node.name
-        for b in node.body:self.visit(b)
-        self.cls=prev
+        prev= self.cls
+
+        self.cls= node.name
+        for b in node.body:
+            self.visit(b)
+
+        self.cls= prev
 
     def visit_AnnAssign(self, node):
         self.visit_annotation(node.annotation)
@@ -215,20 +226,22 @@ class Visitor(ast.NodeVisitor):
     def visit_Assign(self, node):
         def process_target_for_def(target_node):
             if isinstance(target_node, ast.Name):
-                var_name_simple = target_node.id
-                if var_name_simple == "__all__" and not self.current_function_scope and not self.cls:
+                name_simple = target_node.id
+                if name_simple == "__all__" and not self.current_function_scope and not self.cls:
                     return
 
                 scope_parts = [self.mod]
+
                 if self.cls:
                     scope_parts.append(self.cls)
+
                 if self.current_function_scope:
                     scope_parts.extend(self.current_function_scope)
                 
                 prefix = '.'.join(filter(None, scope_parts))
-                qualified_var_name = f"{prefix}.{var_name_simple}" if prefix else var_name_simple
+                var_name = f"{prefix}.{name_simple}" if prefix else name_simple
 
-                self.add_def(qualified_var_name, "variable", target_node.lineno)
+                self.add_def(var_name, "variable", target_node.lineno)
 
             elif isinstance(target_node, (ast.Tuple, ast.List)):
                 for elt in target_node.elts:
@@ -248,8 +261,8 @@ class Visitor(ast.NodeVisitor):
                             value = elt.s
                             
                         if value is not None:
-                            full_name_export = f"{self.mod}.{value}" if self.mod else value
-                            self.add_ref(full_name_export)
+                            export_name = f"{self.mod}.{value}" if self.mod else value
+                            self.add_ref(export_name)
                             self.add_ref(value) 
         
         self.generic_visit(node)
@@ -285,12 +298,13 @@ class Visitor(ast.NodeVisitor):
         elif isinstance(node.func, ast.Name) and node.func.id in ("eval", "exec"):
             self.dyn.add(self.mod.split(".")[0] if self.mod else "")
 
-    def visit_Name(self,node):
-        if isinstance(node.ctx,ast.Load):
+    def visit_Name(self, node):
+        if isinstance(node.ctx, ast.Load):
             for param_name, param_full_name in self.current_function_params:
                 if node.id == param_name:
                     self.add_ref(param_full_name)
                     break
+
             else:
                 # not parameter, handle normally
                 qualified = self.qual(node.id)

{skylos-1.2.2.dist-info → skylos-2.0.0.dist-info}/METADATA

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

{skylos-1.2.2.dist-info → skylos-2.0.0.dist-info}/RECORD

@@ -1,10 +1,11 @@
-skylos/__init__.py,sha256=ZZWhq0TZ3G-yDi9inbYvMn8OBes-pqo1aYB5EivuxFI,152
-skylos/analyzer.py,sha256=cO6J-hOsdJLoyw2vkL2BdX_fS-i5R50suLuh1QqPly4,15144
-skylos/cli.py,sha256=6udZY4vLU6PFzVMkaiCLCRcLXgquyHdmf4rIOAPosWc,18266
-skylos/constants.py,sha256=F1kMjuTxfw2hJjd0SeOQcgex5WhHMUhXCzOlVmwuACs,1230
-skylos/framework_aware.py,sha256=p7BGoFnzkpaLJoE3M5qgyIeZvXx17tOkdyXgeqGKmqU,5804
-skylos/test_aware.py,sha256=cduaWMcFsuzIEQWAMFPC58xGk8NUU3SbUS0ChRPedv8,2372
-skylos/visitor.py,sha256=MnWyzs0b2JOD2Nj1Iu7ZIZHCr7fRC92PY1bsT8bdgXg,12796
+skylos/__init__.py,sha256=xIvJTzzvvgfcQWYMckJFXNNlXPpU1gjO1IldPy7T_N4,151
+skylos/analyzer.py,sha256=TDr_szli65cuQWD6BUcQCUFleM1R-QZD0uRUoHlU6As,14145
+skylos/cli.py,sha256=Xqc_vnueic0D39FI0YzMtJObLsn8MqFFCUnY1nrpEt4,18115
+skylos/constants.py,sha256=vAfKls0OuR5idtXzeMDfYv5-wLtYWDe1NW5TSUJT8RI,1636
+skylos/framework_aware.py,sha256=vbZ1CZIL_2TOEkdH8uVSPPihLM2ctqA01zEHL8HG5sw,5768
+skylos/server.py,sha256=5Rlgy3LdE8I5TWRJJh0n19JqhVYaAOc9fUtRjL-PpX8,16270
+skylos/test_aware.py,sha256=kxYoMG2m02kbMlxtFOM-MWJO8qqxHviP9HgAMbKRfvU,2304
+skylos/visitor.py,sha256=FXNck0qjVB3lfp4X63D5-bE1NsvUTbfvT17ivIevhjk,12654
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/compare_tools.py,sha256=0g9PDeJlbst-7hOaQzrL4MiJFQKpqM8q8VeBGzpPczg,22738
 test/conftest.py,sha256=57sTF6vLL5U0CVKwGQFJcRs6n7t1dEHIriQoSluNmAI,6418
@@ -25,8 +26,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-1.2.2.dist-info/METADATA,sha256=2cvKXdg5thOkSpCbaN7jQ3Lwa10jVmVVB6KvDST3ZOw,224
-skylos-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skylos-1.2.2.dist-info/entry_points.txt,sha256=zzRpN2ByznlQoLeuLolS_TFNYSQxUGBL1EXQsAd6bIA,43
-skylos-1.2.2.dist-info/top_level.txt,sha256=f8GA_7KwfaEopPMP8-EXDQXaqd4IbsOQPakZy01LkdQ,12
-skylos-1.2.2.dist-info/RECORD,,
+skylos-2.0.0.dist-info/METADATA,sha256=gVlJTPqEjfbbnn0TGbDT5aEx8TBtD1r-mitvOfJBI-Y,224
+skylos-2.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skylos-2.0.0.dist-info/entry_points.txt,sha256=zzRpN2ByznlQoLeuLolS_TFNYSQxUGBL1EXQsAd6bIA,43
+skylos-2.0.0.dist-info/top_level.txt,sha256=f8GA_7KwfaEopPMP8-EXDQXaqd4IbsOQPakZy01LkdQ,12
+skylos-2.0.0.dist-info/RECORD,,