Refactoring: Move exceptions module to be private

Hide all of buildstream's internal exceptions from the API surface.

20 files changed, 26 insertions, 24 deletions

diff --git a/tests/artifactcache/tar.py b/tests/artifactcache/tar.py
index 835c5034d..d982aab01 100644
--- a/tests/artifactcache/tar.py
+++ b/tests/artifactcache/tar.py
@@ -7,7 +7,7 @@ import pytest
 
 from buildstream._artifactcache.tarcache import Tar
 from buildstream.utils import get_host_tool
-from buildstream.exceptions import ProgramNotFoundError
+from buildstream._exceptions import ProgramNotFoundError
 
 
 # Test that it 'works' - this may be equivalent to test_archive_no_tar()
diff --git a/tests/context/context.py b/tests/context/context.py
index 48ce037f7..be0dd8a55 100644
--- a/tests/context/context.py
+++ b/tests/context/context.py
@@ -2,7 +2,7 @@ import os
 import pytest
 
 from buildstream import Context
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 
 from tests.testutils.site import HAVE_ROOT
 
diff --git a/tests/format/assertion.py b/tests/format/assertion.py
index ec1305081..27a3d3fc7 100644
--- a/tests/format/assertion.py
+++ b/tests/format/assertion.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from tests.testutils.runcli import cli
 
 # Project directory
diff --git a/tests/format/listdirectiveerrors.py b/tests/format/listdirectiveerrors.py
index 9f2cfaaca..8a5d4f152 100644
--- a/tests/format/listdirectiveerrors.py
+++ b/tests/format/listdirectiveerrors.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from tests.testutils.runcli import cli
 
 # Project directory
diff --git a/tests/format/optionarch.py b/tests/format/optionarch.py
index fce689800..5d28b83f2 100644
--- a/tests/format/optionarch.py
+++ b/tests/format/optionarch.py
@@ -2,7 +2,7 @@ import os
 import pytest
 from contextlib import contextmanager
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from tests.testutils.runcli import cli
 
 # Project directory
diff --git a/tests/format/optionbool.py b/tests/format/optionbool.py
index a02ec742e..3c33a8713 100644
--- a/tests/format/optionbool.py
+++ b/tests/format/optionbool.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from tests.testutils.runcli import cli
 
 # Project directory
diff --git a/tests/format/optioneltmask.py b/tests/format/optioneltmask.py
index 83ccf8b6f..84c594772 100644
--- a/tests/format/optioneltmask.py
+++ b/tests/format/optioneltmask.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from tests.testutils.runcli import cli
 
 # Project directory
diff --git a/tests/format/optionenum.py b/tests/format/optionenum.py
index 5804a5fc1..19dd3d4af 100644
--- a/tests/format/optionenum.py
+++ b/tests/format/optionenum.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from tests.testutils.runcli import cli
 
 # Project directory
diff --git a/tests/format/optionexports.py b/tests/format/optionexports.py
index 849c9148e..d824f0306 100644
--- a/tests/format/optionexports.py
+++ b/tests/format/optionexports.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from tests.testutils.runcli import cli
 
 # Project directory
diff --git a/tests/format/optionflags.py b/tests/format/optionflags.py
index 7ad5f2485..de48ab9d1 100644
--- a/tests/format/optionflags.py
+++ b/tests/format/optionflags.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from tests.testutils.runcli import cli
 
 # Project directory
diff --git a/tests/format/options.py b/tests/format/options.py
index 5cb01622c..1cfea7c71 100644
--- a/tests/format/options.py
+++ b/tests/format/options.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from tests.testutils.runcli import cli
 
 # Project directory
diff --git a/tests/format/projectoverrides.py b/tests/format/projectoverrides.py
index 4d6eb14f5..1824ff0be 100644
--- a/tests/format/projectoverrides.py
+++ b/tests/format/projectoverrides.py
@@ -2,7 +2,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from tests.testutils.runcli import cli
 
 # Project directory
diff --git a/tests/loader/basics.py b/tests/loader/basics.py
index 3135b4b6e..db92efb36 100644
--- a/tests/loader/basics.py
+++ b/tests/loader/basics.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from buildstream._loader import Loader
 from buildstream._metaelement import MetaElement
 from . import make_options
diff --git a/tests/loader/dependencies.py b/tests/loader/dependencies.py
index ac6ee5d4b..bd588867b 100644
--- a/tests/loader/dependencies.py
+++ b/tests/loader/dependencies.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 from buildstream._loader import Loader
 from buildstream._metaelement import MetaElement
 from . import make_options
diff --git a/tests/plugins/basics.py b/tests/plugins/basics.py
index db72a29bc..993d87cec 100644
--- a/tests/plugins/basics.py
+++ b/tests/plugins/basics.py
@@ -4,7 +4,7 @@ import pytest
 from pluginbase import PluginBase
 from buildstream._elementfactory import ElementFactory
 from buildstream._sourcefactory import SourceFactory
-from buildstream import PluginError
+from buildstream._exceptions import PluginError
 
 DATA_DIR = os.path.join(
     os.path.dirname(os.path.realpath(__file__)),
diff --git a/tests/plugins/pipeline.py b/tests/plugins/pipeline.py
index 1d4133f9e..f5c9a0c8f 100644
--- a/tests/plugins/pipeline.py
+++ b/tests/plugins/pipeline.py
@@ -1,7 +1,8 @@
 import os
 import pytest
 
-from buildstream import Context, Project, Scope, PluginError
+from buildstream import Context, Project, Scope
+from buildstream._exceptions import PluginError
 from buildstream._pipeline import Pipeline
 from buildstream._platform import Platform
 
diff --git a/tests/project/project.py b/tests/project/project.py
index 15baa7d3c..430e15b11 100644
--- a/tests/project/project.py
+++ b/tests/project/project.py
@@ -2,7 +2,7 @@ import os
 import pytest
 
 from buildstream import Project, Context
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 
 DATA_DIR = os.path.join(
     os.path.dirname(os.path.realpath(__file__)),
diff --git a/tests/testutils/runcli.py b/tests/testutils/runcli.py
index 593bc9448..0336d8fd5 100644
--- a/tests/testutils/runcli.py
+++ b/tests/testutils/runcli.py
@@ -10,7 +10,7 @@ from buildstream._frontend.main import cli as bst_cli
 from buildstream import _yaml
 
 # Special private exception accessor, for test case purposes
-from buildstream.exceptions import _get_last_exception
+from buildstream._exceptions import _get_last_exception
 
 
 # Wrapper for the click.testing result
diff --git a/tests/testutils/site.py b/tests/testutils/site.py
index 86a300da0..79538efbf 100644
--- a/tests/testutils/site.py
+++ b/tests/testutils/site.py
@@ -4,24 +4,25 @@
 import os
 import sys
 
-from buildstream import exceptions, utils
+from buildstream import utils
+from buildstream._exceptions import ProgramNotFoundError
 
 try:
     utils.get_host_tool('bzr')
     HAVE_BZR = True
-except exceptions.ProgramNotFoundError:
+except ProgramNotFoundError:
     HAVE_BZR = False
 
 try:
     utils.get_host_tool('git')
     HAVE_GIT = True
-except exceptions.ProgramNotFoundError:
+except ProgramNotFoundError:
     HAVE_GIT = False
 
 try:
     utils.get_host_tool('ostree')
     HAVE_OSTREE_CLI = True
-except exceptions.ProgramNotFoundError:
+except ProgramNotFoundError:
     HAVE_OSTREE_CLI = False
 
 try:
@@ -33,7 +34,7 @@ except (ImportError, ValueError):
 try:
     utils.get_host_tool('bwrap')
     HAVE_BWRAP = True
-except exceptions.ProgramNotFoundError:
+except ProgramNotFoundError:
     HAVE_BWRAP = False
 
 IS_LINUX = os.getenv('BST_FORCE_BACKEND', sys.platform).startswith('linux')
diff --git a/tests/yaml/yaml.py b/tests/yaml/yaml.py
index cf12317a9..0aae28f08 100644
--- a/tests/yaml/yaml.py
+++ b/tests/yaml/yaml.py
@@ -3,7 +3,7 @@ import pytest
 from collections import Mapping
 
 from buildstream import _yaml
-from buildstream import LoadError, LoadErrorReason
+from buildstream._exceptions import LoadError, LoadErrorReason
 
 DATA_DIR = os.path.join(
     os.path.dirname(os.path.realpath(__file__)),