From 0b6f36158dd395c3f7aea1b7cb3392fb34187a77 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Wed, 16 Dec 2020 16:15:09 +0100
Subject: [PATCH] osbuild: use load function via the format module

Instead of importing the load, load_build functions into the osbuild
namespace and using it via that, use the load function via the module
that provides them, i.e. the formats.v1 module.
---
 osbuild/__init__.py      | 3 ---
 osbuild/main_cli.py      | 2 +-
 test/mod/test_osbuild.py | 2 +-
 test/test.py             | 4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/osbuild/__init__.py b/osbuild/__init__.py
index 50fc83c1..75317490 100644
--- a/osbuild/__init__.py
+++ b/osbuild/__init__.py
@@ -8,14 +8,11 @@ The utility module `osbuild.util` provides access to common functionality
 independent of osbuild but used across the osbuild codebase.
 """
 
-from .formats.v1 import load, load_build
 from .pipeline import Assembler, Pipeline, Stage
 
 
 __all__ = [
     "Assembler",
-    "load",
-    "load_build",
     "Pipeline",
     "Stage",
 ]
diff --git a/osbuild/main_cli.py b/osbuild/main_cli.py
index 0afa2c26..bc78f3f2 100644
--- a/osbuild/main_cli.py
+++ b/osbuild/main_cli.py
@@ -119,7 +119,7 @@ def osbuild_cli():
     pipeline = manifest.get("pipeline", {})
     sources_options = manifest.get("sources", {})
 
-    pipeline = osbuild.load(pipeline, sources_options)
+    pipeline = fmt.load(pipeline, sources_options)
 
     if args.checkpoint:
         missed = mark_checkpoints(pipeline, args.checkpoint)
diff --git a/test/mod/test_osbuild.py b/test/mod/test_osbuild.py
index b45311cf..39af397e 100644
--- a/test/mod/test_osbuild.py
+++ b/test/mod/test_osbuild.py
@@ -31,7 +31,7 @@ class TestDescriptions(unittest.TestCase):
         ]
         for pipeline in cases:
             with self.subTest(pipeline):
-                self.assertEqual(osbuild.load(pipeline, {}).description(), {})
+                self.assertEqual(fmt.load(pipeline, {}).description(), {})
 
     def test_stage(self):
         name = "org.osbuild.test"
diff --git a/test/test.py b/test/test.py
index eacd5f51..6de69393 100644
--- a/test/test.py
+++ b/test/test.py
@@ -11,7 +11,7 @@ import sys
 import tempfile
 import unittest
 
-import osbuild
+from osbuild.formats import v1 as fmt
 from osbuild.util import linux
 
 
@@ -356,7 +356,7 @@ class OSBuild(contextlib.AbstractContextManager):
         manifest_pipeline = manifest_json.get("pipeline", {})
         manifest_sources = manifest_json.get("sources", {})
 
-        manifest_parsed = osbuild.load(manifest_pipeline, manifest_sources)
+        manifest_parsed = fmt.load(manifest_pipeline, manifest_sources)
         return manifest_parsed.tree_id
 
     @contextlib.contextmanager