switch from loop.create_task to asyncio.create_task
mostly done with sed
This commit is contained in:
parent
66a55ad39b
commit
85b3cd0724
|
@ -171,7 +171,7 @@ class SubiquityClient(TuiApplication):
|
|||
"killing foreground process %s before restarting",
|
||||
self.fg_proc)
|
||||
self.restarting = True
|
||||
self.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self._kill_fg_proc(remove_last_screen, restart_server))
|
||||
return
|
||||
if remove_last_screen:
|
||||
|
@ -179,7 +179,7 @@ class SubiquityClient(TuiApplication):
|
|||
if restart_server:
|
||||
self.restarting = True
|
||||
self.ui.block_input = True
|
||||
self.aio_loop.create_task(self._restart_server())
|
||||
asyncio.create_task(self._restart_server())
|
||||
return
|
||||
if self.urwid_loop is not None:
|
||||
self.urwid_loop.stop()
|
||||
|
@ -257,7 +257,7 @@ class SubiquityClient(TuiApplication):
|
|||
app_state = app_status.state
|
||||
if app_state == ApplicationState.NEEDS_CONFIRMATION:
|
||||
if confirm_task is None:
|
||||
confirm_task = self.aio_loop.create_task(
|
||||
confirm_task = asyncio.create_task(
|
||||
self.noninteractive_confirmation())
|
||||
elif confirm_task is not None:
|
||||
confirm_task.cancel()
|
||||
|
@ -288,7 +288,7 @@ class SubiquityClient(TuiApplication):
|
|||
await asyncio.sleep(0.5)
|
||||
|
||||
async def spinning_wait(message, task):
|
||||
spinner = self.aio_loop.create_task(spin(message))
|
||||
spinner = asyncio.create_task(spin(message))
|
||||
try:
|
||||
return await task
|
||||
finally:
|
||||
|
@ -385,7 +385,7 @@ class SubiquityClient(TuiApplication):
|
|||
[status.event_syslog_id],
|
||||
self.subiquity_event_noninteractive,
|
||||
seek=True)
|
||||
self.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self.noninteractive_watch_app_state(status))
|
||||
|
||||
def _exception_handler(self, loop, context):
|
||||
|
@ -480,7 +480,7 @@ class SubiquityClient(TuiApplication):
|
|||
for i, controller in enumerate(self.controllers.instances):
|
||||
if controller.name == last_screen:
|
||||
index = i
|
||||
self.aio_loop.create_task(self._select_initial_screen(index))
|
||||
asyncio.create_task(self._select_initial_screen(index))
|
||||
|
||||
async def _select_initial_screen(self, index):
|
||||
endpoint_names = []
|
||||
|
@ -530,7 +530,7 @@ class SubiquityClient(TuiApplication):
|
|||
finally:
|
||||
self.in_make_view_cvar.reset(tok)
|
||||
if new.answers:
|
||||
self.aio_loop.create_task(self._start_answers_for_view(new, view))
|
||||
asyncio.create_task(self._start_answers_for_view(new, view))
|
||||
with open(self.state_path('last-screen'), 'w') as fp:
|
||||
fp.write(new.name)
|
||||
return view
|
||||
|
@ -561,7 +561,7 @@ class SubiquityClient(TuiApplication):
|
|||
elif key == 'ctrl u':
|
||||
1/0
|
||||
elif key == 'ctrl b':
|
||||
self.aio_loop.create_task(self.client.dry_run.crash.GET())
|
||||
asyncio.create_task(self.client.dry_run.crash.GET())
|
||||
else:
|
||||
super().unhandled_input(key)
|
||||
|
||||
|
|
|
@ -68,7 +68,7 @@ class FilesystemController(SubiquityTuiController, FilesystemManipulator):
|
|||
|
||||
status = await self.endpoint.guided.GET()
|
||||
if status.status == ProbeStatus.PROBING:
|
||||
self.app.aio_loop.create_task(self._wait_for_probing())
|
||||
asyncio.create_task(self._wait_for_probing())
|
||||
self.current_view = SlowProbing(self)
|
||||
else:
|
||||
self.current_view = self.make_guided_ui(status)
|
||||
|
@ -274,18 +274,18 @@ class FilesystemController(SubiquityTuiController, FilesystemManipulator):
|
|||
self.ui.set_body(FilesystemView(self.model, self))
|
||||
|
||||
def guided_choice(self, choice):
|
||||
self.app.aio_loop.create_task(self._guided_choice(choice))
|
||||
asyncio.create_task(self._guided_choice(choice))
|
||||
|
||||
async def _guided(self):
|
||||
self.ui.set_body((await self.make_ui())())
|
||||
|
||||
def guided(self):
|
||||
self.app.aio_loop.create_task(self._guided())
|
||||
asyncio.create_task(self._guided())
|
||||
|
||||
def reset(self, refresh_view):
|
||||
log.info("Resetting Filesystem model")
|
||||
self.app.ui.block_input = True
|
||||
self.app.aio_loop.create_task(self._reset(refresh_view))
|
||||
asyncio.create_task(self._reset(refresh_view))
|
||||
|
||||
async def _reset(self, refresh_view):
|
||||
status = await self.endpoint.reset.POST()
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
import os
|
||||
import shutil
|
||||
|
@ -117,7 +118,7 @@ class NetworkController(SubiquityTuiController, NetworkAnswersMixin):
|
|||
def end_ui(self):
|
||||
if self.view is not None:
|
||||
self.view = None
|
||||
self.app.aio_loop.create_task(self.unsubscribe())
|
||||
asyncio.create_task(self.unsubscribe())
|
||||
|
||||
def cancel(self):
|
||||
self.app.prev_screen()
|
||||
|
@ -127,36 +128,36 @@ class NetworkController(SubiquityTuiController, NetworkAnswersMixin):
|
|||
|
||||
def set_static_config(self, dev_name: str, ip_version: int,
|
||||
static_config: StaticConfig) -> None:
|
||||
self.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self.endpoint.set_static_config.POST(
|
||||
dev_name, ip_version, static_config))
|
||||
|
||||
def enable_dhcp(self, dev_name, ip_version: int) -> None:
|
||||
self.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self.endpoint.enable_dhcp.POST(dev_name, ip_version))
|
||||
|
||||
def disable_network(self, dev_name: str, ip_version: int) -> None:
|
||||
self.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self.endpoint.disable.POST(dev_name, ip_version))
|
||||
|
||||
def add_vlan(self, dev_name: str, vlan_id: int):
|
||||
self.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self.endpoint.vlan.PUT(dev_name, vlan_id))
|
||||
|
||||
def set_wlan(self, dev_name: str, wlan: WLANConfig) -> None:
|
||||
self.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self.endpoint.set_wlan.POST(dev_name, wlan))
|
||||
|
||||
def start_scan(self, dev_name: str) -> None:
|
||||
self.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self.endpoint.start_scan.POST(dev_name))
|
||||
|
||||
def delete_link(self, dev_name: str):
|
||||
self.app.aio_loop.create_task(self.endpoint.delete.POST(dev_name))
|
||||
asyncio.create_task(self.endpoint.delete.POST(dev_name))
|
||||
|
||||
def add_or_update_bond(self, existing_name: Optional[str],
|
||||
new_name: str, new_info: BondConfig) -> None:
|
||||
self.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self.endpoint.add_or_edit_bond.POST(
|
||||
existing_name, new_name, new_info))
|
||||
|
||||
|
|
|
@ -61,10 +61,10 @@ class ProgressController(SubiquityTuiController):
|
|||
pass
|
||||
|
||||
def start(self):
|
||||
self.app.aio_loop.create_task(self._wait_status())
|
||||
asyncio.create_task(self._wait_status())
|
||||
|
||||
def click_reboot(self):
|
||||
self.app.aio_loop.create_task(self.send_reboot_and_wait())
|
||||
asyncio.create_task(self.send_reboot_and_wait())
|
||||
|
||||
async def send_reboot_and_wait(self):
|
||||
try:
|
||||
|
|
|
@ -442,6 +442,6 @@ class ErrorReporter(object):
|
|||
self.reports.insert(0, report)
|
||||
self._reports_by_base[error_ref.base] = report
|
||||
|
||||
loop.call_soon(loop.create_task, report.load())
|
||||
loop.call_soon(asyncio.create_task, report.load())
|
||||
|
||||
return report
|
||||
|
|
|
@ -132,7 +132,7 @@ class LateController(CmdListController):
|
|||
return env
|
||||
|
||||
def start(self):
|
||||
self.app.aio_loop.create_task(self._run())
|
||||
asyncio.create_task(self._run())
|
||||
|
||||
async def _run(self):
|
||||
Install = self.app.controllers.Install
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
|
@ -139,12 +140,12 @@ class InstallController(SubiquityController):
|
|||
def stop_uu(self):
|
||||
if self.app.state == ApplicationState.UU_RUNNING:
|
||||
self.app.update_state(ApplicationState.UU_CANCELLING)
|
||||
self.app.aio_loop.create_task(self.stop_unattended_upgrades())
|
||||
asyncio.create_task(self.stop_unattended_upgrades())
|
||||
|
||||
def start(self):
|
||||
journald_listen(
|
||||
self.app.aio_loop, [self.app.log_syslog_id], self.log_event)
|
||||
self.install_task = self.app.aio_loop.create_task(self.install())
|
||||
self.install_task = asyncio.create_task(self.install())
|
||||
|
||||
def tpath(self, *path):
|
||||
return os.path.join(self.model.target, *path)
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
import os
|
||||
|
||||
|
@ -43,7 +44,7 @@ class LocaleController(SubiquityController):
|
|||
self.model.selected_language = os.environ.get("LANG") \
|
||||
or self.autoinstall_default
|
||||
|
||||
self.app.aio_loop.create_task(self.configured())
|
||||
asyncio.create_task(self.configured())
|
||||
self.app.hub.subscribe(
|
||||
(InstallerChannels.CONFIGURED, 'source'), self._set_source)
|
||||
|
||||
|
|
|
@ -118,7 +118,7 @@ class NetworkController(BaseNetworkController, SubiquityController):
|
|||
log.debug('maybe_start_install_wpasupplicant')
|
||||
if self.install_wpasupplicant_task is not None:
|
||||
return
|
||||
self.install_wpasupplicant_task = self.app.aio_loop.create_task(
|
||||
self.install_wpasupplicant_task = asyncio.create_task(
|
||||
self._install_wpasupplicant())
|
||||
|
||||
def wlan_support_install_state(self):
|
||||
|
@ -302,7 +302,7 @@ class NetworkController(BaseNetworkController, SubiquityController):
|
|||
client = make_client_for_conn(NetEventAPI, conn)
|
||||
lock = asyncio.Lock()
|
||||
self.clients[socket_path] = (client, conn, lock)
|
||||
self.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self._call_client(
|
||||
client, conn, lock, "route_watch",
|
||||
self.network_event_receiver.default_routes))
|
||||
|
@ -329,7 +329,7 @@ class NetworkController(BaseNetworkController, SubiquityController):
|
|||
def _call_clients(self, meth_name, *args):
|
||||
for client, conn, lock in self.clients.values():
|
||||
log.debug('creating _call_client task %s %s', conn.path, meth_name)
|
||||
self.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self._call_client(client, conn, lock, meth_name, *args))
|
||||
|
||||
def apply_starting(self):
|
||||
|
|
|
@ -73,8 +73,8 @@ class ShutdownController(SubiquityController):
|
|||
return self.app.interactive
|
||||
|
||||
def start(self):
|
||||
self.app.aio_loop.create_task(self._wait_install())
|
||||
self.app.aio_loop.create_task(self._run())
|
||||
asyncio.create_task(self._wait_install())
|
||||
asyncio.create_task(self._run())
|
||||
|
||||
async def _wait_install(self):
|
||||
await self.app.controllers.Install.install_task
|
||||
|
|
|
@ -432,7 +432,7 @@ class SubiquityServer(Application):
|
|||
self.update_state(ApplicationState.ERROR)
|
||||
if not self.running_error_commands:
|
||||
self.running_error_commands = True
|
||||
self.aio_loop.create_task(self._run_error_cmds(report))
|
||||
asyncio.create_task(self._run_error_cmds(report))
|
||||
|
||||
@web.middleware
|
||||
async def middleware(self, request, handler):
|
||||
|
|
|
@ -144,12 +144,12 @@ class ErrorReportStretchy(Stretchy):
|
|||
self.report = app.error_reporter.get(ref)
|
||||
self.pending = None
|
||||
if self.report is None:
|
||||
self.app.aio_loop.create_task(self._wait())
|
||||
asyncio.create_task(self._wait())
|
||||
else:
|
||||
connect_signal(self.report, 'changed', self._report_changed)
|
||||
self.report.mark_seen()
|
||||
self.interrupting = interrupting
|
||||
self.min_wait = self.app.aio_loop.create_task(asyncio.sleep(0.1))
|
||||
self.min_wait = asyncio.create_task(asyncio.sleep(0.1))
|
||||
|
||||
self.btns = {
|
||||
'cancel': other_btn(
|
||||
|
@ -268,15 +268,15 @@ class ErrorReportStretchy(Stretchy):
|
|||
def _report_changed(self):
|
||||
if self.pending:
|
||||
self.pending.cancel()
|
||||
self.pending = self.app.aio_loop.create_task(asyncio.sleep(0.1))
|
||||
self.change_task = self.app.aio_loop.create_task(
|
||||
self.pending = asyncio.create_task(asyncio.sleep(0.1))
|
||||
self.change_task = asyncio.create_task(
|
||||
self._report_changed_())
|
||||
|
||||
async def _report_changed_(self):
|
||||
await self.pending
|
||||
self.pending = None
|
||||
await self.min_wait
|
||||
self.min_wait = self.app.aio_loop.create_task(asyncio.sleep(1))
|
||||
self.min_wait = asyncio.create_task(asyncio.sleep(1))
|
||||
if self.report:
|
||||
self.error_ref = self.report.ref()
|
||||
self.pile.contents[:] = [
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
import os
|
||||
|
||||
|
@ -409,7 +410,7 @@ class HelpMenu(PopUpLauncher):
|
|||
|
||||
def _open(self, sender):
|
||||
log.debug("open help menu")
|
||||
self.app.aio_loop.create_task(self._get_ssh_info())
|
||||
asyncio.create_task(self._get_ssh_info())
|
||||
|
||||
def create_pop_up(self):
|
||||
self._menu = OpenHelpMenu(self)
|
||||
|
|
|
@ -13,7 +13,9 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
|
||||
from urwid import (
|
||||
LineBox,
|
||||
Text,
|
||||
|
@ -264,7 +266,7 @@ class InstallConfirmation(Stretchy):
|
|||
self.app.ui.body.hide_continue()
|
||||
self.app.remove_global_overlay(self)
|
||||
if self.app.controllers.Progress.showing:
|
||||
self.app.aio_loop.create_task(self.app.confirm_install())
|
||||
asyncio.create_task(self.app.confirm_install())
|
||||
else:
|
||||
self.app.next_screen(self.app.confirm_install())
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import asyncio
|
||||
import locale
|
||||
import logging
|
||||
|
||||
|
@ -258,7 +259,7 @@ class Detector:
|
|||
|
||||
def do_step(self, step_index):
|
||||
self.abort()
|
||||
self.keyboard_view.controller.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self._do_step(step_index))
|
||||
|
||||
async def _do_step(self, step_index):
|
||||
|
@ -422,7 +423,7 @@ class KeyboardView(BaseView):
|
|||
layout = data['layout']
|
||||
variant = data.get('variant', layout.variants[0])
|
||||
setting = KeyboardSetting(layout=layout.code, variant=variant.code)
|
||||
self.controller.app.aio_loop.create_task(self._check_toggle(setting))
|
||||
asyncio.create_task(self._check_toggle(setting))
|
||||
|
||||
async def _apply(self, setting):
|
||||
await self.controller.app.wait_with_text_dialog(
|
||||
|
@ -430,7 +431,7 @@ class KeyboardView(BaseView):
|
|||
self.controller.done()
|
||||
|
||||
def really_done(self, setting):
|
||||
self.controller.app.aio_loop.create_task(self._apply(setting))
|
||||
asyncio.create_task(self._apply(setting))
|
||||
|
||||
def cancel(self, result=None):
|
||||
self.controller.cancel()
|
||||
|
|
|
@ -376,7 +376,7 @@ class SnapListView(BaseView):
|
|||
async def _wait_load(self, spinner):
|
||||
# If we show the loading screen at all, we want to show it for
|
||||
# at least a second to avoid flickering at the user.
|
||||
min_wait = self.controller.app.aio_loop.create_task(asyncio.sleep(1))
|
||||
min_wait = asyncio.create_task(asyncio.sleep(1))
|
||||
data = await self.controller.get_list_wait()
|
||||
await min_wait
|
||||
spinner.stop()
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
Provides device activation and configuration on s390x
|
||||
|
||||
"""
|
||||
import asyncio
|
||||
import logging
|
||||
|
||||
from urwid import (
|
||||
|
@ -83,7 +84,7 @@ class ZdevList(WidgetWrap):
|
|||
self.update(new_zdevinfos)
|
||||
|
||||
def zdev_action(self, sender, action, zdevinfo):
|
||||
self.parent.controller.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self._zdev_action(action, zdevinfo))
|
||||
|
||||
def update(self, zdevinfos):
|
||||
|
|
|
@ -129,7 +129,7 @@ class Application:
|
|||
|
||||
async def run(self):
|
||||
self.base_model = self.make_model()
|
||||
self.aio_loop.create_task(self.start())
|
||||
asyncio.create_task(self.start())
|
||||
await self.exit_event.wait()
|
||||
if self._exc:
|
||||
exc, self._exc = self._exc, None
|
||||
|
|
|
@ -157,7 +157,7 @@ class TuiApplication(Application):
|
|||
def _show():
|
||||
self.ui.block_input = False
|
||||
nonlocal min_show_task
|
||||
min_show_task = self.aio_loop.create_task(
|
||||
min_show_task = asyncio.create_task(
|
||||
asyncio.sleep(MIN_SHOW_PROGRESS_TIME))
|
||||
show()
|
||||
|
||||
|
@ -190,7 +190,7 @@ class TuiApplication(Application):
|
|||
|
||||
async def w():
|
||||
return await orig
|
||||
awaitable = task_to_cancel = self.aio_loop.create_task(w())
|
||||
awaitable = task_to_cancel = asyncio.create_task(w())
|
||||
else:
|
||||
task_to_cancel = None
|
||||
|
||||
|
@ -247,10 +247,10 @@ class TuiApplication(Application):
|
|||
self.ui.set_body(view)
|
||||
|
||||
def next_screen(self, coro=None):
|
||||
self.aio_loop.create_task(self.move_screen(1, coro))
|
||||
asyncio.create_task(self.move_screen(1, coro))
|
||||
|
||||
def prev_screen(self):
|
||||
self.aio_loop.create_task(self.move_screen(-1, None))
|
||||
asyncio.create_task(self.move_screen(-1, None))
|
||||
|
||||
def select_initial_screen(self):
|
||||
self.next_screen()
|
||||
|
|
|
@ -19,6 +19,7 @@ Provides network device listings and extended network information
|
|||
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
|
||||
from urwid import (
|
||||
|
@ -297,7 +298,7 @@ class NetworkView(BaseView):
|
|||
self.show_stretchy_overlay(stretchy)
|
||||
|
||||
def _action_INFO(self, name, dev_info):
|
||||
self.controller.app.aio_loop.create_task(
|
||||
asyncio.create_task(
|
||||
self._show_INFO(dev_info.name))
|
||||
_action_INFO.opens_dialog = True
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ class SummaryController(SubiquityTuiController):
|
|||
self.summary_view = None
|
||||
|
||||
def start(self):
|
||||
self.app.aio_loop.create_task(self._wait_status())
|
||||
asyncio.create_task(self._wait_status())
|
||||
|
||||
def cancel(self):
|
||||
self.app.cancel()
|
||||
|
@ -37,7 +37,7 @@ class SummaryController(SubiquityTuiController):
|
|||
pass
|
||||
|
||||
def click_reboot(self):
|
||||
self.app.aio_loop.create_task(self.send_reboot_and_wait())
|
||||
asyncio.create_task(self.send_reboot_and_wait())
|
||||
|
||||
async def send_reboot_and_wait(self):
|
||||
try:
|
||||
|
|
|
@ -12,6 +12,8 @@
|
|||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import asyncio
|
||||
import os
|
||||
import shutil
|
||||
import logging
|
||||
|
@ -38,7 +40,7 @@ class ConfigureController(SubiquityController):
|
|||
self.model = app.base_model
|
||||
|
||||
def start(self):
|
||||
self.install_task = self.app.aio_loop.create_task(self.configure())
|
||||
self.install_task = asyncio.create_task(self.configure())
|
||||
|
||||
def __locale_gen_cmd(self) -> Tuple[str, bool]:
|
||||
""" Return a tuple of the locale-gen command path and True for
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import asyncio
|
||||
import enum
|
||||
import os
|
||||
import logging
|
||||
|
@ -39,8 +40,8 @@ class SetupShutdownController(ShutdownController):
|
|||
self.mode = WSLShutdownMode.COMPLETE # allow the complete mode
|
||||
|
||||
def start(self):
|
||||
self.app.aio_loop.create_task(self._wait_install())
|
||||
self.app.aio_loop.create_task(self._run())
|
||||
asyncio.create_task(self._wait_install())
|
||||
asyncio.create_task(self._run())
|
||||
|
||||
async def _wait_install(self):
|
||||
await self.app.controllers.Install.install_task
|
||||
|
|
Loading…
Reference in New Issue