import fixes

1 files changed, 9 insertions, 8 deletions

diff --git a/bsie/tools/builder.py b/bsie/tools/builder.py
index 8f7a410..8c6b931 100644
--- a/bsie/tools/builder.py
+++ b/bsie/tools/builder.py
@@ -13,6 +13,7 @@ import typing
 from bsie import base
 from bsie.base import errors
 from bsie.utils.bsfs import URI, typename
+from bsie.utils import bsfs
 
 # inner-module imports
 from . import pipeline
@@ -61,7 +62,7 @@ def _unpack_name(name):
 
 
 class ReaderBuilder():
-    """Build `bsie.base.reader.Reader` instances.
+    """Build `bsie.base.Reader` instances.
 
     Readers are defined via their qualified class name
     (e.g., bsie.reader.path.Path) and optional keyword
@@ -83,7 +84,7 @@ class ReaderBuilder():
         self.kwargs = kwargs
         self.cache = {}
 
-    def build(self, name: str) -> base.reader.Reader:
+    def build(self, name: str) -> base.Reader:
         """Return an instance for the qualified class name."""
         # return cached instance
         if name in self.cache:
@@ -98,7 +99,7 @@ class ReaderBuilder():
         # get kwargs
         kwargs = self.kwargs.get(name, {})
         if not isinstance(kwargs, dict):
-            raise TypeError(f'expected a kwargs dict, found {typename(kwargs)}')
+            raise TypeError(f'expected a kwargs dict, found {bsfs.typename(kwargs)}')
 
         try: # build, cache, and return instance
             obj = cls(**kwargs)
@@ -108,11 +109,11 @@ class ReaderBuilder():
             return obj
 
         except Exception as err:
-            raise errors.BuilderError(f'failed to build reader {name} due to {typename(err)}: {err}') from err
+            raise errors.BuilderError(f'failed to build reader {name} due to {bsfs.typename(err)}: {err}') from err
 
 
 class ExtractorBuilder():
-    """Build `bsie.base.extractor.Extractor instances.
+    """Build `bsie.base.Extractor instances.
 
     It is permissible to build multiple instances of the same extractor
     (typically with different arguments), hence the ExtractorBuilder
@@ -133,14 +134,14 @@ class ExtractorBuilder():
         """Iterate over extractor specifications."""
         return iter(range(len(self.specs)))
 
-    def build(self, index: int) -> base.extractor.Extractor:
+    def build(self, index: int) -> base.Extractor:
         """Return an instance of the n'th extractor (n=*index*)."""
         # get build instructions
         specs = self.specs[index]
 
         # check specs structure. expecting[{name: {kwargs}}]
         if not isinstance(specs, dict):
-            raise TypeError(f'expected a dict, found {typename(specs)}')
+            raise TypeError(f'expected a dict, found {bsfs.typename(specs)}')
         if len(specs) != 1:
             raise TypeError(f'expected a dict of length one, found {len(specs)}')
 
@@ -150,7 +151,7 @@ class ExtractorBuilder():
 
         # check kwargs structure
         if not isinstance(kwargs, dict):
-            raise TypeError(f'expected a dict, found {typename(kwargs)}')
+            raise TypeError(f'expected a dict, found {bsfs.typename(kwargs)}')
 
         # check name and get module/class components
         module_name, class_name = _unpack_name(name)