Rename variable to something more appropriate

Author: rocky

trepan/processor/location.py

@@ -54,7 +54,7 @@ def resolve_location(proc, location) -> Optional[Location]:
         pass
 
     location_method = location.method
-    filename = lineno = mod_func = None
+    filename = lineno = mod_or_func_or_code = None
     if location_method:
         # Validate arguments that can't be done in parsing
         if location_method == "<module>":
@@ -73,16 +73,16 @@ def resolve_location(proc, location) -> Optional[Location]:
                 if len(modules):
                     # There is at least one matching module. (They all
                     # should be the same.)
-                    mod_func = modules[0]
+                    mod_or_func_or_code = modules[0]
                 else:
                     proc.errmsg(f"Cannot resolve <module> from a path {filename}")
                     return INVALID_LOCATION
 
-        if mod_func is None:
+        if mod_or_func_or_code is None:
             # [1] DRY similar code [2] below
             msg = f"Object {location_method} is not known yet as a function."
             try:
-                mod_func = eval(location_method, g, locals_dict)
+                mod_or_func_or_code = eval(location_method, g, locals_dict)
             except Exception:
                 proc.errmsg(msg)
                 split_names = location_method.split(".")
@@ -98,45 +98,45 @@ def resolve_location(proc, location) -> Optional[Location]:
                 # trepan-xpy() which has it's own type of compatible
                 # Function, that would fail an `inspect.isfunction()`
                 # test.
-                if hasattr(mod_func, "__code__") or hasattr(mod_func, "im_func"):
+                if hasattr(mod_or_func_or_code, "__code__") or hasattr(mod_or_func_or_code, "im_func"):
                     offset = -1
                 else:
                     proc.errmsg(msg)
                     return INVALID_LOCATION
             except Exception:
                 proc.errmsg(msg)
                 return INVALID_LOCATION
-            filename = proc.core.canonic(mod_func.__code__.co_filename)
+            filename = proc.core.canonic(mod_or_func_or_code.__code__.co_filename)
 
             # FIXME: we may want to check lineno and
             # respect that in the future
-            lineno = mod_func.__code__.co_firstlineno
+            lineno = mod_or_func_or_code.__code__.co_firstlineno
 
     elif location.path:
         filename = proc.core.canonic(location.path)
         lineno = location.line_number
-        mod_func = None
+        mod_or_func_or_code = None
         msg = f"{location.path} is not known as a file"
         if not osp.isfile(filename):
             # See if argument is a module
             try:
-                mod_func = eval(location.path, g, locals_dict)
+                mod_or_func_or_code = eval(location.path, g, locals_dict)
             except Exception:
                 msg = f"Don't see '{location.path}' as a existing file or as an module"
                 proc.errmsg(msg)
                 return INVALID_LOCATION
             pass
             is_address = location.is_address
-            if inspect.ismodule(mod_func):
-                if hasattr(mod_func, "__file__"):
-                    filename = pyficache.resolve_name_to_path(mod_func.__file__)
+            if inspect.ismodule(mod_or_func_or_code):
+                if hasattr(mod_or_func_or_code, "__file__"):
+                    filename = pyficache.resolve_name_to_path(mod_or_func_or_code.__file__)
                     filename = proc.core.canonic(filename)
                     if not lineno:
                         # use first line of module file
                         lineno = 1
                         offset = 0
                         is_address = False
-                    return Location(filename, lineno, is_address, mod_func, offset)
+                    return Location(filename, lineno, is_address, mod_or_func_or_code, offset)
                 else:
                     msg = f"module '{location.path}' doesn't have a file associated with it"
 
@@ -155,7 +155,7 @@ def resolve_location(proc, location) -> Optional[Location]:
             code_info, lineinfo = pyficache.code_line_info(filename, lineno)
             if lineinfo:
                 offset = lineinfo[0].offsets[0]
-                mod_func = code_info[lineinfo[0].name]
+                mod_or_func_or_code = code_info[lineinfo[0].name]
             else:
                 return INVALID_LOCATION
 
@@ -167,26 +167,26 @@ def resolve_location(proc, location) -> Optional[Location]:
         filename = frame2file(proc.core, curframe, canonic=False)
         lineno = location.line_number
         is_address = location.is_address
-        mod_func = curframe.f_code
+        mod_or_func_or_code = curframe.f_code
         if offset is None:
             code_info, lineinfo = pyficache.code_line_info(filename, lineno, include_offsets=True)
             if lineinfo:
                 offset = lineinfo[0].offsets[0]
-                mod_func_name = lineinfo[0].name
-                if mod_func.co_name != mod_func_name:
+                mod_or_func_or_code_name = lineinfo[0].name
+                if mod_or_func_or_code.co_name != mod_or_func_or_code_name:
                     # Breakpoint is in a nested function/method.
                     # Get new code object
-                    mod_func = code_info.get(mod_func_name, mod_func)
+                    mod_or_func_or_code = code_info.get(mod_or_func_or_code_name, mod_or_func_or_code)
                 pass
             else:
                 return INVALID_LOCATION
     elif location.offset is not None:
         filename = frame2file(proc.core, curframe, canonic=False)
         is_address = True
         lineno = None
-        mod_func = None
+        mod_or_func_or_code = None
         offset = location.offset
-    return Location(filename, lineno, is_address, mod_func, offset)
+    return Location(filename, lineno, is_address, mod_or_func_or_code, offset)
 
 
 def resolve_address_location(proc, location) -> Optional[Location]:
@@ -217,7 +217,7 @@ def resolve_address_location(proc, location) -> Optional[Location]:
         msg = f"Object {location.method} is not known yet as a function."
         # [2] DRY simlar code above [1]
         try:
-            mod_func = eval(location.method, g, locals_dict)
+            mod_or_func_or_code = eval(location.method, g, locals_dict)
         except Exception:
             split_names = location_method.split(".")
             if len(split_names) > 1:
@@ -227,43 +227,43 @@ def resolve_address_location(proc, location) -> Optional[Location]:
 
         try:
             # Check if the converted string is a function or instance method
-            if inspect.isfunction(mod_func) or hasattr(mod_func, "im_func"):
+            if inspect.isfunction(mod_or_func_or_code) or hasattr(mod_or_func_or_code, "im_func"):
                 pass
             else:
                 proc.errmsg(msg)
                 return INVALID_LOCATION
         except Exception:
             proc.errmsg(msg)
             return INVALID_LOCATION
-        filename = proc.core.canonic(mod_func.func_code.co_filename)
+        filename = proc.core.canonic(mod_or_func_or_code.func_code.co_filename)
         # FIXME: we may want to check offset and
         # respect that in the future
         offset = 0
     elif location.path:
         filename = proc.core.canonic(location.path)
         offset = location.line_number
         is_address = location.is_address
-        mod_func = None
+        mod_or_func_or_code = None
         msg = f"{location.path} is not known as a file"
         if not osp.isfile(filename):
             # See if argument is a module
             try:
-                mod_func = eval(location.path, g, locals_dict)
+                mod_or_func_or_code = eval(location.path, g, locals_dict)
             except Exception:
                 msg = f"Don't see '{location.path}' as a existing file or as an module"
                 proc.errmsg(msg)
                 return INVALID_LOCATION
             pass
             is_address = location.is_address
-            if inspect.ismodule(mod_func):
-                if hasattr(mod_func, "__file__"):
-                    filename = pyficache.resolve_name_to_path(mod_func.__file__)
+            if inspect.ismodule(mod_or_func_or_code):
+                if hasattr(mod_or_func_or_code, "__file__"):
+                    filename = pyficache.resolve_name_to_path(mod_or_func_or_code.__file__)
                     filename = proc.core.canonic(filename)
                     if not offset:
                         # use first offset of module file
                         offset = 0
                         is_address = True
-                    return Location(filename, offset, is_address, mod_func, offset)
+                    return Location(filename, offset, is_address, mod_or_func_or_code, offset)
                 else:
                     msg = f"module '{location.path}' doesn't have a file associated with it"
 
@@ -280,14 +280,14 @@ def resolve_address_location(proc, location) -> Optional[Location]:
         filename = frame2file(proc.core, curframe, canonic=False)
         offset = location.line_number
         is_address = location.is_address
-        mod_func = proc.list_object
+        mod_or_func_or_code = proc.list_object
     else:
         proc.errmsg(
             f"Location {location} doesn't have enough information for a location."
         )
         return INVALID_LOCATION
 
-    return Location(filename, offset, is_address, mod_func, offset)
+    return Location(filename, offset, is_address, mod_or_func_or_code, offset)
 
 
 # Demo it