summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2018-04-02 15:54:07 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2018-04-02 16:01:54 +0900
commit00ad7629a4aa6ef7b447f4327bb39f8b4cb28440 (patch)
treea894f1a5364b9d2ef524a55a73f70bf868f1a20f
parent999d168ad254e8b02a8d089457aa592b3eb81975 (diff)
downloadbuildstream-00ad7629a4aa6ef7b447f4327bb39f8b4cb28440.tar.gz
_frontend/app.py: Renamed from main.py
Since the CLI and the App object was split up, we should name the file after the object which it implements.
-rw-r--r--buildstream/_frontend/app.py (renamed from buildstream/_frontend/main.py)0
-rw-r--r--buildstream/_frontend/cli.py2
-rw-r--r--tests/frontend/main.py2
3 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/_frontend/main.py b/buildstream/_frontend/app.py
index 5ec6884a0..5ec6884a0 100644
--- a/buildstream/_frontend/main.py
+++ b/buildstream/_frontend/app.py
diff --git a/buildstream/_frontend/cli.py b/buildstream/_frontend/cli.py
index 5efa97b7e..dd9a62eff 100644
--- a/buildstream/_frontend/cli.py
+++ b/buildstream/_frontend/cli.py
@@ -157,7 +157,7 @@ def cli(context, **kwargs):
user preferences configuration file.
"""
- from .main import App
+ from .app import App
# Create the App, giving it the main arguments
context.obj = App(dict(kwargs))
diff --git a/tests/frontend/main.py b/tests/frontend/main.py
index 9ba552c60..41337b54d 100644
--- a/tests/frontend/main.py
+++ b/tests/frontend/main.py
@@ -1,4 +1,4 @@
-from buildstream._frontend.main import prefix_choice_value_proc
+from buildstream._frontend.app import prefix_choice_value_proc
import pytest
import click