import fixes

1 files changed, 9 insertions, 10 deletions

diff --git a/test/tools/test_builder.py b/test/tools/test_builder.py
index bc6f903..62c637c 100644
--- a/test/tools/test_builder.py
+++ b/test/tools/test_builder.py
@@ -10,8 +10,7 @@ import unittest
 
 # bsie imports
 from bsie import base
-from bsie.base import errors
-from bsie.utils.bsfs import URI
+from bsie.utils import bsfs
 
 # objects to test
 from bsie.tools.builder import ExtractorBuilder
@@ -26,12 +25,12 @@ from bsie.tools.builder import _unpack_name
 class TestUtils(unittest.TestCase):
     def test_safe_load(self):
         # invalid module
-        self.assertRaises(errors.LoaderError, _safe_load, 'dBGHMSAYOoKeKMpywDoKZQycENFPvN', 'foobar')
-        self.assertRaises(errors.LoaderError, _safe_load, 'dBGHMSAYOoKeKMpywDoKZQycENFPvN.bar', 'foobar')
+        self.assertRaises(base.errors.LoaderError, _safe_load, 'dBGHMSAYOoKeKMpywDoKZQycENFPvN', 'foobar')
+        self.assertRaises(base.errors.LoaderError, _safe_load, 'dBGHMSAYOoKeKMpywDoKZQycENFPvN.bar', 'foobar')
         # partially valid module
-        self.assertRaises(errors.LoaderError, _safe_load, 'os.foo', 'foobar')
+        self.assertRaises(base.errors.LoaderError, _safe_load, 'os.foo', 'foobar')
         # invalid class
-        self.assertRaises(errors.LoaderError, _safe_load, 'os.path', 'foo')
+        self.assertRaises(base.errors.LoaderError, _safe_load, 'os.path', 'foo')
         # valid module and class
         cls = _safe_load('collections.abc', 'Container')
         import collections.abc
@@ -65,10 +64,10 @@ class TestReaderBuilder(unittest.TestCase):
         self.assertRaises(TypeError, builder.build, None)
         self.assertRaises(ValueError, builder.build, '')
         self.assertRaises(ValueError, builder.build, 'Path')
-        self.assertRaises(errors.BuilderError, builder.build, 'path.Path')
+        self.assertRaises(base.errors.BuilderError, builder.build, 'path.Path')
         # invalid config
         builder = ReaderBuilder({'bsie.reader.stat.Stat': dict(foo=123)})
-        self.assertRaises(errors.BuilderError, builder.build, 'bsie.reader.stat.Stat')
+        self.assertRaises(base.errors.BuilderError, builder.build, 'bsie.reader.stat.Stat')
         builder = ReaderBuilder({'bsie.reader.stat.Stat': 123})
         self.assertRaises(TypeError, builder.build, 'bsie.reader.stat.Stat')
         # no instructions
@@ -143,7 +142,7 @@ class TestExtractorBuilder(unittest.TestCase):
             ]))
 
         # building with invalid args
-        self.assertRaises(errors.BuilderError, ExtractorBuilder(
+        self.assertRaises(base.errors.BuilderError, ExtractorBuilder(
             [{'bsie.extractor.generic.path.Path': {'foo': 123}}]).build, 0)
         # non-dict build specification
         self.assertRaises(TypeError, ExtractorBuilder(
@@ -161,7 +160,7 @@ class TestExtractorBuilder(unittest.TestCase):
 
 class TestPipelineBuilder(unittest.TestCase):
     def test_build(self):
-        prefix = URI('http://example.com/local/file#')
+        prefix = bsfs.URI('http://example.com/local/file#')
         c_schema = '''
             bse:author rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;