move async_helpers to subiquitycore
This commit is contained in:
parent
5a7abd99b7
commit
08e081415d
|
@ -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
|
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
|
running things in the background and subiquity uses
|
||||||
[asyncio](https://docs.python.org/3/library/asyncio.html) for this.
|
[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`)
|
* `run_in_thread` (just a nicer wrapper around `run_in_executor`)
|
||||||
* `schedule_task` (a wrapper around `create_task` / `ensure_future`)
|
* `schedule_task` (a wrapper around `create_task` / `ensure_future`)
|
||||||
|
|
|
@ -31,13 +31,12 @@ import requests
|
||||||
|
|
||||||
import urwid
|
import urwid
|
||||||
|
|
||||||
from subiquitycore.controller import BaseController
|
from subiquitycore.async_helpers import (
|
||||||
from subiquitycore.core import Skip
|
|
||||||
|
|
||||||
from subiquity.async_helpers import (
|
|
||||||
run_in_thread,
|
run_in_thread,
|
||||||
schedule_task,
|
schedule_task,
|
||||||
)
|
)
|
||||||
|
from subiquitycore.controller import BaseController
|
||||||
|
from subiquitycore.core import Skip
|
||||||
|
|
||||||
|
|
||||||
log = logging.getLogger('subiquity.controllers.error')
|
log = logging.getLogger('subiquity.controllers.error')
|
||||||
|
|
|
@ -32,18 +32,17 @@ from curtin.commands.install import (
|
||||||
from systemd import journal
|
from systemd import journal
|
||||||
|
|
||||||
import yaml
|
import yaml
|
||||||
|
from subiquitycore.async_helpers import (
|
||||||
|
run_in_thread,
|
||||||
|
schedule_task,
|
||||||
|
)
|
||||||
|
from subiquitycore.controller import BaseController
|
||||||
from subiquitycore.utils import (
|
from subiquitycore.utils import (
|
||||||
arun_command,
|
arun_command,
|
||||||
astart_command,
|
astart_command,
|
||||||
run_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.controllers.error import ErrorReportKind
|
||||||
from subiquity.ui.views.installprogress import ProgressView
|
from subiquity.ui.views.installprogress import ProgressView
|
||||||
|
|
||||||
|
|
|
@ -15,9 +15,9 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from subiquitycore.async_helpers import schedule_task
|
||||||
from subiquitycore.controller import BaseController
|
from subiquitycore.controller import BaseController
|
||||||
|
|
||||||
from subiquity.async_helpers import schedule_task
|
|
||||||
from subiquity.models.keyboard import KeyboardSetting
|
from subiquity.models.keyboard import KeyboardSetting
|
||||||
from subiquity.ui.views import KeyboardView
|
from subiquity.ui.views import KeyboardView
|
||||||
|
|
||||||
|
|
|
@ -18,12 +18,12 @@ import logging
|
||||||
import requests
|
import requests
|
||||||
from xml.etree import ElementTree
|
from xml.etree import ElementTree
|
||||||
|
|
||||||
from subiquitycore.controller import BaseController
|
from subiquitycore.async_helpers import (
|
||||||
|
|
||||||
from subiquity.async_helpers import (
|
|
||||||
run_in_thread,
|
run_in_thread,
|
||||||
schedule_task,
|
schedule_task,
|
||||||
)
|
)
|
||||||
|
from subiquitycore.controller import BaseController
|
||||||
|
|
||||||
from subiquity.ui.views.mirror import MirrorView
|
from subiquity.ui.views.mirror import MirrorView
|
||||||
|
|
||||||
log = logging.getLogger('subiquity.controllers.mirror')
|
log = logging.getLogger('subiquity.controllers.mirror')
|
||||||
|
|
|
@ -19,12 +19,12 @@ import os
|
||||||
|
|
||||||
import requests.exceptions
|
import requests.exceptions
|
||||||
|
|
||||||
|
from subiquitycore.async_helpers import (
|
||||||
|
schedule_task,
|
||||||
|
)
|
||||||
from subiquitycore.controller import BaseController
|
from subiquitycore.controller import BaseController
|
||||||
from subiquitycore.core import Skip
|
from subiquitycore.core import Skip
|
||||||
|
|
||||||
from subiquity.async_helpers import (
|
|
||||||
schedule_task,
|
|
||||||
)
|
|
||||||
|
|
||||||
log = logging.getLogger('subiquity.controllers.refresh')
|
log = logging.getLogger('subiquity.controllers.refresh')
|
||||||
|
|
||||||
|
|
|
@ -17,12 +17,12 @@ import logging
|
||||||
|
|
||||||
import requests.exceptions
|
import requests.exceptions
|
||||||
|
|
||||||
|
from subiquitycore.async_helpers import (
|
||||||
|
schedule_task,
|
||||||
|
)
|
||||||
from subiquitycore.controller import BaseController
|
from subiquitycore.controller import BaseController
|
||||||
from subiquitycore.core import Skip
|
from subiquitycore.core import Skip
|
||||||
|
|
||||||
from subiquity.async_helpers import (
|
|
||||||
schedule_task,
|
|
||||||
)
|
|
||||||
from subiquity.models.snaplist import SnapSelection
|
from subiquity.models.snaplist import SnapSelection
|
||||||
from subiquity.ui.views.snaplist import SnapListView
|
from subiquity.ui.views.snaplist import SnapListView
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ from urllib.parse import (
|
||||||
urlencode,
|
urlencode,
|
||||||
)
|
)
|
||||||
|
|
||||||
from subiquity.async_helpers import run_in_thread
|
from subiquitycore.async_helpers import run_in_thread
|
||||||
from subiquitycore.utils import run_command
|
from subiquitycore.utils import run_command
|
||||||
|
|
||||||
import requests_unixsocket
|
import requests_unixsocket
|
||||||
|
|
|
@ -22,19 +22,18 @@ import yaml
|
||||||
|
|
||||||
from probert.network import IFF_UP, NetworkEventReceiver
|
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.models.network import BondParameters, sanitize_config
|
||||||
|
from subiquitycore import netplan
|
||||||
from subiquitycore.ui.views.network import (
|
from subiquitycore.ui.views.network import (
|
||||||
NetworkView,
|
NetworkView,
|
||||||
)
|
)
|
||||||
from subiquitycore.controller import BaseController
|
|
||||||
from subiquitycore.utils import (
|
from subiquitycore.utils import (
|
||||||
arun_command,
|
arun_command,
|
||||||
run_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")
|
log = logging.getLogger("subiquitycore.controller.network")
|
||||||
|
|
Loading…
Reference in New Issue