omdev 0.0.0.dev390__py3-none-any.whl → 0.0.0.dev391__py3-none-any.whl

omdev/.manifests.json

@@ -225,7 +225,7 @@
     "module": ".py.scripts.importtrace",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/scripts/importtrace.py",
-    "line": 477,
+    "line": 490,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/importtrace",

omdev/py/scripts/importtrace.py

@@ -219,6 +219,14 @@ class ImportTracer:
         node_stack = [Node()]
 
         def new_import(name, globals=None, locals=None, fromlist=(), level=0):  # noqa
+            __builtins__.__import__ = old_import
+
+            st = [
+                StackTraceEntry(*s[1:4])
+                for s in inspect.stack()
+                if s[0].f_code.co_filename != __file__
+            ]
+
             node = Node(
                 import_name=name,
                 import_fromlist=fromlist,
@@ -227,17 +235,15 @@ class ImportTracer:
                 pid=os.getpid(),
                 tid=threading.current_thread().ident,
 
-                stacktrace=[
-                    StackTraceEntry(*s[1:4])
-                    for s in inspect.stack()
-                    if s[0].f_code.co_filename != __file__
-                ],
+                stacktrace=st,
 
                 cached_id=id(sys.modules[name]) if name in sys.modules else None,
 
                 start_stats=self._stats_factory(),
             )
 
+            __builtins__.__import__ = new_import
+
             node_stack[-1].children.append(node)
             node_stack.append(node)
 
@@ -245,9 +251,11 @@ class ImportTracer:
                 loaded = old_import(name, globals, locals, fromlist, level)
                 if not isinstance(loaded, types.ModuleType):
                     raise TypeError(loaded)  # noqa
+
                 node.loaded_name = loaded.__name__
                 node.loaded_id = id(loaded)
                 node.loaded_file = getattr(loaded, '__file__', None)
+
                 return loaded
 
             except Exception as ex:
@@ -255,8 +263,13 @@ class ImportTracer:
                 raise
 
             finally:
+                __builtins__.__import__ = old_import
+
                 node.end_stats = self._stats_factory()
                 node.stats = node.end_stats - node.start_stats
+
+                __builtins__.__import__ = new_import
+
                 if node_stack.pop() is not node:
                     raise RuntimeError(node_stack)
 

{omdev-0.0.0.dev390.dist-info → omdev-0.0.0.dev391.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev390
+Version: 0.0.0.dev391
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev390
+Requires-Dist: omlish==0.0.0.dev391
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev390.dist-info → omdev-0.0.0.dev391.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=cprM065HGO3vKL_ru2fzUGi-J3goZ_jMLkm_B3qGM94,11863
+omdev/.manifests.json,sha256=gnB4QF-VVal4TXg8B48JefTAsjmkXGk7imY8vHYyejc,11863
 omdev/__about__.py,sha256=fQNmzSa1MntcPSrzg_Vpo6JRU2RbXik2NqRz0oQCApE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -248,7 +248,7 @@ omdev/py/docstrings/rest.py,sha256=c2xPYg_W01W9eYY_KLKX69E4qu4jpkgUshi5K5EyVv8,5
 omdev/py/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/scripts/bumpversion.py,sha256=UDMtTd_wfkqsmrtHqTKDilWVzUBigzZAOCVND7t9jyw,1124
 omdev/py/scripts/execstat.py,sha256=eyk_TCeJt-xtMGqaW3X7pnEBe7JZbXrTYsODn_m6lfM,3869
-omdev/py/scripts/importtrace.py,sha256=jbL4HIafCBNCBlXyfMppdRBhCk5v6UAd0_H2f0_zPwM,14025
+omdev/py/scripts/importtrace.py,sha256=F5K7ZH57S2kekigDZBXpuDjm8HgozfEQ39BNCjkmUrE,14241
 omdev/py/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/tools/importscan.py,sha256=4dCH0coX0OqNwesteKaTE8GxuSfLhgXYQlzNUXLiSNY,4640
 omdev/py/tools/mkrelimp.py,sha256=kuzfS4GWcGi-ItyhEHSW4hV9ZcfDJL6inDMhDp1V2lE,4049
@@ -316,9 +316,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev390.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev390.dist-info/METADATA,sha256=-LWkeaCBhpcnK3I8SJsOqN_4n0hpptF5QTjc1j7_oXM,5094
-omdev-0.0.0.dev390.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev390.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev390.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev390.dist-info/RECORD,,
+omdev-0.0.0.dev391.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev391.dist-info/METADATA,sha256=WRAQ03DrnIlkqnumh1h6uFEHUZL7cJqsJf9jB2ZfNNE,5094
+omdev-0.0.0.dev391.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev391.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev391.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev391.dist-info/RECORD,,