From 632d01334c58e21df35570194a942cb901a77f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 9 Mar 2018 10:02:44 +0100 Subject: [PATCH] =?UTF-8?q?Renamed=20module=20tracer=20=E2=86=92=20trace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is consistent with the other module names. --- blender_asset_tracer/cli/list_deps.py | 6 +++--- blender_asset_tracer/pack/__init__.py | 6 +++--- blender_asset_tracer/{tracer => trace}/__init__.py | 0 .../{tracer => trace}/blocks2assets.py | 0 blender_asset_tracer/{tracer => trace}/expanders.py | 0 .../{tracer => trace}/file2blocks.py | 0 .../{tracer => trace}/file_sequence.py | 0 .../{tracer => trace}/modifier_walkers.py | 0 blender_asset_tracer/{tracer => trace}/result.py | 0 tests/test_tracer.py | 12 ++++++------ tests/test_tracer_file2blocks.py | 2 +- tests/test_tracer_file_sequence.py | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) rename blender_asset_tracer/{tracer => trace}/__init__.py (100%) rename blender_asset_tracer/{tracer => trace}/blocks2assets.py (100%) rename blender_asset_tracer/{tracer => trace}/expanders.py (100%) rename blender_asset_tracer/{tracer => trace}/file2blocks.py (100%) rename blender_asset_tracer/{tracer => trace}/file_sequence.py (100%) rename blender_asset_tracer/{tracer => trace}/modifier_walkers.py (100%) rename blender_asset_tracer/{tracer => trace}/result.py (100%) diff --git a/blender_asset_tracer/cli/list_deps.py b/blender_asset_tracer/cli/list_deps.py index 49169a7..f4e77dc 100644 --- a/blender_asset_tracer/cli/list_deps.py +++ b/blender_asset_tracer/cli/list_deps.py @@ -5,7 +5,7 @@ import logging import pathlib import sys -from blender_asset_tracer import tracer +from blender_asset_tracer import trace from . import common log = logging.getLogger(__name__) @@ -37,7 +37,7 @@ def report_text(bpath): last_reported_bfile = None shorten = functools.partial(common.shorten, pathlib.Path.cwd()) - for usage in tracer.deps(bpath): + for usage in trace.deps(bpath): filepath = usage.block.bfile.filepath.absolute() if filepath != last_reported_bfile: print(shorten(filepath)) @@ -68,7 +68,7 @@ def report_json(bpath): # Mapping from blend file to its dependencies. report = collections.defaultdict(set) - for usage in tracer.deps(bpath): + for usage in trace.deps(bpath): filepath = usage.block.bfile.filepath.absolute() for assetpath in usage.files(): assetpath = assetpath.resolve() diff --git a/blender_asset_tracer/pack/__init__.py b/blender_asset_tracer/pack/__init__.py index a6c0400..b793899 100644 --- a/blender_asset_tracer/pack/__init__.py +++ b/blender_asset_tracer/pack/__init__.py @@ -5,9 +5,9 @@ import logging import pathlib import typing -from blender_asset_tracer import tracer, bpathlib, blendfile +from blender_asset_tracer import trace, bpathlib, blendfile from blender_asset_tracer.cli import common -from blender_asset_tracer.tracer import result +from blender_asset_tracer.trace import result from . import queued_copy log = logging.getLogger(__name__) @@ -78,7 +78,7 @@ class Packer: act.new_path = bfile_pp new_location_paths = set() - for usage in tracer.deps(self.blendfile): + for usage in trace.deps(self.blendfile): # Needing rewriting is not a per-asset thing, but a per-asset-per- # blendfile thing, since different blendfiles can refer to it in # different ways (for example with relative and absolute paths). diff --git a/blender_asset_tracer/tracer/__init__.py b/blender_asset_tracer/trace/__init__.py similarity index 100% rename from blender_asset_tracer/tracer/__init__.py rename to blender_asset_tracer/trace/__init__.py diff --git a/blender_asset_tracer/tracer/blocks2assets.py b/blender_asset_tracer/trace/blocks2assets.py similarity index 100% rename from blender_asset_tracer/tracer/blocks2assets.py rename to blender_asset_tracer/trace/blocks2assets.py diff --git a/blender_asset_tracer/tracer/expanders.py b/blender_asset_tracer/trace/expanders.py similarity index 100% rename from blender_asset_tracer/tracer/expanders.py rename to blender_asset_tracer/trace/expanders.py diff --git a/blender_asset_tracer/tracer/file2blocks.py b/blender_asset_tracer/trace/file2blocks.py similarity index 100% rename from blender_asset_tracer/tracer/file2blocks.py rename to blender_asset_tracer/trace/file2blocks.py diff --git a/blender_asset_tracer/tracer/file_sequence.py b/blender_asset_tracer/trace/file_sequence.py similarity index 100% rename from blender_asset_tracer/tracer/file_sequence.py rename to blender_asset_tracer/trace/file_sequence.py diff --git a/blender_asset_tracer/tracer/modifier_walkers.py b/blender_asset_tracer/trace/modifier_walkers.py similarity index 100% rename from blender_asset_tracer/tracer/modifier_walkers.py rename to blender_asset_tracer/trace/modifier_walkers.py diff --git a/blender_asset_tracer/tracer/result.py b/blender_asset_tracer/trace/result.py similarity index 100% rename from blender_asset_tracer/tracer/result.py rename to blender_asset_tracer/trace/result.py diff --git a/tests/test_tracer.py b/tests/test_tracer.py index bafd0b1..44ff892 100644 --- a/tests/test_tracer.py +++ b/tests/test_tracer.py @@ -3,7 +3,7 @@ import logging import sys import typing -from blender_asset_tracer import tracer, blendfile +from blender_asset_tracer import trace, blendfile from blender_asset_tracer.blendfile import dna from abstract_test import AbstractBlendFileTest @@ -29,7 +29,7 @@ class AssetHoldingBlocksTest(AbstractTracerTest): blocks_seen = 0 seen_scene = seen_ob = False - for block in tracer.asset_holding_blocks(self.bf.blocks): + for block in trace.asset_holding_blocks(self.bf.blocks): assert isinstance(block, blendfile.BlendFileBlock) blocks_seen += 1 @@ -71,7 +71,7 @@ class DepsTest(AbstractTracerTest): return field.name.name_full.decode() def assert_deps(self, blend_fname, expects: dict): - for dep in tracer.deps(self.blendfiles / blend_fname): + for dep in trace.deps(self.blendfiles / blend_fname): actual_type = dep.block.dna_type.dna_type_id.decode() actual_full_field = self.field_name(dep.path_full_field) actual_dirname = self.field_name(dep.path_dir_field) @@ -138,7 +138,7 @@ class DepsTest(AbstractTracerTest): # Test the filename expansion. expected = [self.blendfiles / ('imgseq/%06d.png' % num) for num in range(210, 215)] - for dep in tracer.deps(self.blendfiles / 'image_sequencer.blend'): + for dep in trace.deps(self.blendfiles / 'image_sequencer.blend'): if dep.block_name != b'SQ000210.png': continue @@ -214,7 +214,7 @@ class DepsTest(AbstractTracerTest): }) def test_usage_abspath(self): - deps = [dep for dep in tracer.deps(self.blendfiles / 'doubly_linked.blend') + deps = [dep for dep in trace.deps(self.blendfiles / 'doubly_linked.blend') if dep.asset_path == b'//material_textures.blend'] usage = deps[0] @@ -235,7 +235,7 @@ class DepsTest(AbstractTracerTest): try: sys.setrecursionlimit(80) # This should finish without hitting the recursion limit. - for _ in tracer.deps(infinite_bfile): + for _ in trace.deps(infinite_bfile): pass finally: sys.setrecursionlimit(reclim) diff --git a/tests/test_tracer_file2blocks.py b/tests/test_tracer_file2blocks.py index f9fc74c..e1fcc83 100644 --- a/tests/test_tracer_file2blocks.py +++ b/tests/test_tracer_file2blocks.py @@ -1,5 +1,5 @@ from blender_asset_tracer import blendfile -from blender_asset_tracer.tracer import file2blocks +from blender_asset_tracer.trace import file2blocks from test_tracer import AbstractTracerTest diff --git a/tests/test_tracer_file_sequence.py b/tests/test_tracer_file_sequence.py index ea7590a..6f52233 100644 --- a/tests/test_tracer_file_sequence.py +++ b/tests/test_tracer_file_sequence.py @@ -1,6 +1,6 @@ from abstract_test import AbstractBlendFileTest -from blender_asset_tracer.tracer import file_sequence +from blender_asset_tracer.trace import file_sequence class ExpandFileSequenceTest(AbstractBlendFileTest):