From 08e081415d29bcd0cabd6ba0680d2ddaf279736d Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 12 Dec 2019 16:03:58 +1300 Subject: [PATCH] move async_helpers to subiquitycore --- DESIGN.md | 2 +- subiquity/controllers/error.py | 7 +++---- subiquity/controllers/installprogress.py | 11 +++++------ subiquity/controllers/keyboard.py | 2 +- subiquity/controllers/mirror.py | 6 +++--- subiquity/controllers/refresh.py | 6 +++--- subiquity/controllers/snaplist.py | 6 +++--- subiquity/snapd.py | 2 +- {subiquity => subiquitycore}/async_helpers.py | 0 subiquitycore/controllers/network.py | 9 ++++----- 10 files changed, 24 insertions(+), 27 deletions(-) rename {subiquity => subiquitycore}/async_helpers.py (100%) diff --git a/DESIGN.md b/DESIGN.md index 81fe3040..71708e37 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -148,7 +148,7 @@ controllers don't have a corresponding model class. If the UI does not block, as promised above, then there needs to be a way of running things in the background and subiquity uses [asyncio](https://docs.python.org/3/library/asyncio.html) for this. -`subiquity.async_helpers` defines two useful helper functions: +`subiquitycore.async_helpers` defines two useful helper functions: * `run_in_thread` (just a nicer wrapper around `run_in_executor`) * `schedule_task` (a wrapper around `create_task` / `ensure_future`) diff --git a/subiquity/controllers/error.py b/subiquity/controllers/error.py index 877af933..bc1717b3 100644 --- a/subiquity/controllers/error.py +++ b/subiquity/controllers/error.py @@ -31,13 +31,12 @@ import requests import urwid -from subiquitycore.controller import BaseController -from subiquitycore.core import Skip - -from subiquity.async_helpers import ( +from subiquitycore.async_helpers import ( run_in_thread, schedule_task, ) +from subiquitycore.controller import BaseController +from subiquitycore.core import Skip log = logging.getLogger('subiquity.controllers.error') diff --git a/subiquity/controllers/installprogress.py b/subiquity/controllers/installprogress.py index 26c4d55f..00036099 100644 --- a/subiquity/controllers/installprogress.py +++ b/subiquity/controllers/installprogress.py @@ -32,18 +32,17 @@ from curtin.commands.install import ( from systemd import journal import yaml - +from subiquitycore.async_helpers import ( + run_in_thread, + schedule_task, + ) +from subiquitycore.controller import BaseController from subiquitycore.utils import ( arun_command, astart_command, run_command, ) -from subiquitycore.controller import BaseController -from subiquity.async_helpers import ( - run_in_thread, - schedule_task, - ) from subiquity.controllers.error import ErrorReportKind from subiquity.ui.views.installprogress import ProgressView diff --git a/subiquity/controllers/keyboard.py b/subiquity/controllers/keyboard.py index a7aea556..43079480 100644 --- a/subiquity/controllers/keyboard.py +++ b/subiquity/controllers/keyboard.py @@ -15,9 +15,9 @@ import logging +from subiquitycore.async_helpers import schedule_task from subiquitycore.controller import BaseController -from subiquity.async_helpers import schedule_task from subiquity.models.keyboard import KeyboardSetting from subiquity.ui.views import KeyboardView diff --git a/subiquity/controllers/mirror.py b/subiquity/controllers/mirror.py index eda57bab..ab9c835c 100644 --- a/subiquity/controllers/mirror.py +++ b/subiquity/controllers/mirror.py @@ -18,12 +18,12 @@ import logging import requests from xml.etree import ElementTree -from subiquitycore.controller import BaseController - -from subiquity.async_helpers import ( +from subiquitycore.async_helpers import ( run_in_thread, schedule_task, ) +from subiquitycore.controller import BaseController + from subiquity.ui.views.mirror import MirrorView log = logging.getLogger('subiquity.controllers.mirror') diff --git a/subiquity/controllers/refresh.py b/subiquity/controllers/refresh.py index 9fcc3a60..e5c3b405 100644 --- a/subiquity/controllers/refresh.py +++ b/subiquity/controllers/refresh.py @@ -19,12 +19,12 @@ import os import requests.exceptions +from subiquitycore.async_helpers import ( + schedule_task, + ) from subiquitycore.controller import BaseController from subiquitycore.core import Skip -from subiquity.async_helpers import ( - schedule_task, - ) log = logging.getLogger('subiquity.controllers.refresh') diff --git a/subiquity/controllers/snaplist.py b/subiquity/controllers/snaplist.py index 1278329e..c6cfbe75 100644 --- a/subiquity/controllers/snaplist.py +++ b/subiquity/controllers/snaplist.py @@ -17,12 +17,12 @@ import logging import requests.exceptions +from subiquitycore.async_helpers import ( + schedule_task, + ) from subiquitycore.controller import BaseController from subiquitycore.core import Skip -from subiquity.async_helpers import ( - schedule_task, - ) from subiquity.models.snaplist import SnapSelection from subiquity.ui.views.snaplist import SnapListView diff --git a/subiquity/snapd.py b/subiquity/snapd.py index fbc4ea50..5064280f 100644 --- a/subiquity/snapd.py +++ b/subiquity/snapd.py @@ -25,7 +25,7 @@ from urllib.parse import ( urlencode, ) -from subiquity.async_helpers import run_in_thread +from subiquitycore.async_helpers import run_in_thread from subiquitycore.utils import run_command import requests_unixsocket diff --git a/subiquity/async_helpers.py b/subiquitycore/async_helpers.py similarity index 100% rename from subiquity/async_helpers.py rename to subiquitycore/async_helpers.py diff --git a/subiquitycore/controllers/network.py b/subiquitycore/controllers/network.py index e5a11d75..42d089d9 100644 --- a/subiquitycore/controllers/network.py +++ b/subiquitycore/controllers/network.py @@ -22,19 +22,18 @@ import yaml from probert.network import IFF_UP, NetworkEventReceiver +from subiquitycore.async_helpers import SingleInstanceTask +from subiquitycore.controller import BaseController +from subiquitycore.file_util import write_file from subiquitycore.models.network import BondParameters, sanitize_config +from subiquitycore import netplan from subiquitycore.ui.views.network import ( NetworkView, ) -from subiquitycore.controller import BaseController from subiquitycore.utils import ( arun_command, run_command, ) -from subiquitycore.file_util import write_file -from subiquitycore import netplan - -from subiquity.async_helpers import SingleInstanceTask log = logging.getLogger("subiquitycore.controller.network")