FileLocator is a better name than FileWrangler.

3 files changed, 15 insertions, 15 deletions

diff --git a/coverage/codeunit.py b/coverage/codeunit.py
index ab681011..221d677a 100644
--- a/coverage/codeunit.py
+++ b/coverage/codeunit.py
@@ -2,11 +2,11 @@
 
 import glob, os, types
 
-def code_unit_factory(morfs, file_wrangler, omit_prefixes=None):
+def code_unit_factory(morfs, file_locator, omit_prefixes=None):
     """Construct a list of CodeUnits from polymorphic inputs.
     
     `morfs` is a module or a filename, or a list of same.
-    `file_wrangler` is a FileWrangler that can help resolve filenames.
+    `file_locator` is a FileLocator that can help resolve filenames.
     `omit_prefixes` is a list of prefixes.  CodeUnits that match those prefixes
     will be omitted from the list.
     
@@ -27,10 +27,10 @@ def code_unit_factory(morfs, file_wrangler, omit_prefixes=None):
             globbed.append(morf)
     morfs = globbed
 
-    code_units = [CodeUnit(morf, file_wrangler) for morf in morfs]
+    code_units = [CodeUnit(morf, file_locator) for morf in morfs]
     
     if omit_prefixes:
-        prefixes = [file_wrangler.abs_file(p) for p in omit_prefixes]
+        prefixes = [file_locator.abs_file(p) for p in omit_prefixes]
         filtered = []
         for cu in code_units:
             for prefix in prefixes:
@@ -52,18 +52,18 @@ class CodeUnit:
     
     """
 
-    def __init__(self, morf, file_wrangler):
+    def __init__(self, morf, file_locator):
         if hasattr(morf, '__file__'):
             f = morf.__file__
         else:
             f = morf
-        self.filename = file_wrangler.canonical_filename(f)
+        self.filename = file_locator.canonical_filename(f)
 
         if hasattr(morf, '__name__'):
             n = morf.__name__
         else:
             n = os.path.splitext(morf)[0]
-            n = file_wrangler.relative_filename(n)
+            n = file_locator.relative_filename(n)
         self.name = n
 
     def __cmp__(self, other):
diff --git a/coverage/control.py b/coverage/control.py
index f452d1a1..4251b2c4 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -5,7 +5,7 @@ import os, re, sys
 from coverage.data import CoverageData
 from coverage.misc import nice_pair, CoverageException
 from coverage.codeunit import code_unit_factory
-from coverage.files import FileWrangler
+from coverage.files import FileLocator
 
 class coverage:
     def __init__(self):
@@ -16,7 +16,7 @@ class coverage:
         self.nesting = 0
         self.cstack = []
         self.xstack = []
-        self.file_wrangler = FileWrangler()
+        self.file_locator = FileLocator()
         
         self.collector = Collector(self.should_trace)
         
@@ -45,7 +45,7 @@ class coverage:
             return False
         # TODO: flag: ignore std lib?
         # TODO: ignore by module as well as file?
-        return self.file_wrangler.canonical_filename(filename)
+        return self.file_locator.canonical_filename(filename)
 
     def use_cache(self, usecache, cache_file=None):
         self.data.usefile(usecache, cache_file)
@@ -123,7 +123,7 @@ class coverage:
             ext = '.py'
         if ext == '.py':
             if not os.path.exists(filename):
-                source = self.file_wrangler.get_zip_data(filename)
+                source = self.file_locator.get_zip_data(filename)
                 if not source:
                     raise CoverageException(
                         "No source for code '%s'." % morf.filename
@@ -172,7 +172,7 @@ class coverage:
         return f, s, m, mf
 
     def analysis2(self, morf):
-        code_units = code_unit_factory(morf, self.file_wrangler)
+        code_units = code_unit_factory(morf, self.file_locator)
         return self.analysis_engine(code_units[0])
 
     def analysis_engine(self, morf):
@@ -202,7 +202,7 @@ class coverage:
         self.report_engine(morfs, show_missing=show_missing, ignore_errors=ignore_errors, file=file)
 
     def report_engine(self, morfs, show_missing=True, ignore_errors=False, file=None, omit_prefixes=None):
-        code_units = code_unit_factory(morfs, self.file_wrangler, omit_prefixes)
+        code_units = code_unit_factory(morfs, self.file_locator, omit_prefixes)
         code_units.sort()
 
         max_name = max(5, max(map(lambda cu: len(cu.name), code_units)))
@@ -257,7 +257,7 @@ class coverage:
     else_re = re.compile(r"\s*else\s*:\s*(#|$)")
 
     def annotate(self, morfs, directory=None, ignore_errors=False, omit_prefixes=None):
-        code_units = code_unit_factory(morfs, self.file_wrangler, omit_prefixes)
+        code_units = code_unit_factory(morfs, self.file_locator, omit_prefixes)
         for cu in code_units:
             try:
                 filename, statements, excluded, missing, _ = self.analysis_engine(cu)
diff --git a/coverage/files.py b/coverage/files.py
index 625357c3..99db390a 100644
--- a/coverage/files.py
+++ b/coverage/files.py
@@ -2,7 +2,7 @@
 
 import os, sys
 
-class FileWrangler:
+class FileLocator:
     """Understand how filenames work."""
 
     def __init__(self):