small

Author: smacke

docs/HISTORY.rst

@@ -1,6 +1,10 @@
 History
 =======
 
+0.0.66 (2024-10-06)
+-------------------
+* Small configuration simplification;
+
 0.0.65 (2024-08-25)
 -------------------
 * Implement garbage collection for invalidated AST bookkeeping;

pyccolo/ast_rewriter.py

@@ -106,22 +106,22 @@ def visit(self, node: ast.AST):
             ),
         )
         orig_to_copy_mapping = mapper(node)
-        tracer = self._tracers[-1]
-        old_bookkeeper = tracer.ast_bookkeeper_by_fname.get(self._path)
+        last_tracer = self._tracers[-1]
+        old_bookkeeper = last_tracer.ast_bookkeeper_by_fname.get(self._path)
         module_id = id(node) if self._module_id is None else self._module_id
-        new_bookkeeper = tracer.ast_bookkeeper_by_fname[
+        new_bookkeeper = last_tracer.ast_bookkeeper_by_fname[
             self._path
         ] = AstBookkeeper.create(self._path, module_id)
         if old_bookkeeper is not None:
-            tracer.remove_bookkeeping(old_bookkeeper, module_id)
+            last_tracer.remove_bookkeeping(old_bookkeeper, module_id)
         BookkeepingVisitor(
             new_bookkeeper.ast_node_by_id,
             new_bookkeeper.containing_ast_by_id,
             new_bookkeeper.containing_stmt_by_id,
             new_bookkeeper.parent_stmt_by_id,
             new_bookkeeper.stmt_by_lineno,
         ).visit(orig_to_copy_mapping[id(node)])
-        tracer.add_bookkeeping(new_bookkeeper, module_id)
+        last_tracer.add_bookkeeping(new_bookkeeper, module_id)
         self.orig_to_copy_mapping = orig_to_copy_mapping
         raw_handler_predicates_by_event: DefaultDict[
             TraceEvent, List[Predicate]
@@ -202,4 +202,6 @@ def visit(self, node: ast.AST):
                 handler_guards_by_event,
                 expr_rewriter,
             ).visit(node)
+        if not any(tracer.requires_ast_bookkeeping for tracer in self._tracers):
+            last_tracer.remove_bookkeeping(new_bookkeeper, module_id)
         return node

pyccolo/import_hooks.py

@@ -128,7 +128,7 @@ def get_data(self, path: str) -> bytes:
             if len(parts) < 3:
                 return super().get_data(path)
             source_path = pyccolo_source_from_cache(path)
-            if parts[-3] == self.make_cache_signature(source_path):
+            if self.make_cache_signature(source_path) in (parts[-3], "pyccolo"):
                 return super().get_data(path)
             path = source_path
         path_str = str(path)