From 93f4f31f4548726c1d9cb113d36ec351971f948b Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 20 Apr 2019 00:25:44 +0800 Subject: [PATCH] devices.ctlmgr -> master.ctlmgr --- artiq/devices/__init__.py | 0 artiq/frontend/artiq_ctlmgr.py | 2 +- artiq/{devices => master}/ctlmgr.py | 0 artiq/test/test_ctlmgr.py | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 artiq/devices/__init__.py rename artiq/{devices => master}/ctlmgr.py (100%) diff --git a/artiq/devices/__init__.py b/artiq/devices/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/artiq/frontend/artiq_ctlmgr.py b/artiq/frontend/artiq_ctlmgr.py index c16ed9b50..4d8bf2c41 100755 --- a/artiq/frontend/artiq_ctlmgr.py +++ b/artiq/frontend/artiq_ctlmgr.py @@ -11,7 +11,7 @@ from artiq.protocols.pc_rpc import Server from artiq.protocols.logging import LogForwarder, SourceFilter from artiq.tools import (simple_network_args, atexit_register_coroutine, bind_address_from_args, add_common_args) -from artiq.devices.ctlmgr import ControllerManager +from artiq.devices.master import ControllerManager def get_argparser(): diff --git a/artiq/devices/ctlmgr.py b/artiq/master/ctlmgr.py similarity index 100% rename from artiq/devices/ctlmgr.py rename to artiq/master/ctlmgr.py diff --git a/artiq/test/test_ctlmgr.py b/artiq/test/test_ctlmgr.py index 18ab6bdcd..3090d2104 100644 --- a/artiq/test/test_ctlmgr.py +++ b/artiq/test/test_ctlmgr.py @@ -4,7 +4,7 @@ import unittest import logging import asyncio -from artiq.devices.ctlmgr import Controllers +from artiq.devices.master import Controllers from artiq.protocols.pc_rpc import AsyncioClient from artiq.tools import expect_no_log_messages