From d3e6dd11406893bfbc5537dfbe74d8151bbc1280 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 12 Dec 2017 09:59:50 -0800 Subject: mpm: Harmonize imports, tidy + sort modules - Moved nijesdcore to cores/ - Moved udev, net, dtoverlay, uio to sys_utils/ - Made all imports non-relative (except in __init__.py files) - Removed some unnecessary imports - Reordered some imports for Python conventions --- mpm/python/usrp_mpm/dboard_manager/magnesium.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'mpm/python/usrp_mpm/dboard_manager/magnesium.py') diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium.py b/mpm/python/usrp_mpm/dboard_manager/magnesium.py index 9cbb2bd9b..e43f324af 100644 --- a/mpm/python/usrp_mpm/dboard_manager/magnesium.py +++ b/mpm/python/usrp_mpm/dboard_manager/magnesium.py @@ -24,15 +24,15 @@ import time import threading import math from six import iterkeys, iteritems -from . import lib # Pulls in everything from C++-land -from .base import DboardManagerBase -from .. import nijesdcore -from ..uio import UIO -from ..mpmlog import get_logger -from .lmk_mg import LMK04828Mg -from usrp_mpm.periph_manager.udev import get_eeprom_paths +from usrp_mpm import lib # Pulls in everything from C++-land +from usrp_mpm.dboard_manager import DboardManagerBase +from usrp_mpm.dboard_manager.lmk_mg import LMK04828Mg +from usrp_mpm.cores import nijesdcore +from usrp_mpm.mpmlog import get_logger +from usrp_mpm.sys_utils.uio import UIO +from usrp_mpm.sys_utils.udev import get_eeprom_paths +from usrp_mpm.sys_utils.sysfs_gpio import SysFSGPIO from usrp_mpm.cores import ClockSynchronizer -from ..sysfs_gpio import SysFSGPIO from usrp_mpm.bfrfs import BufferFS from usrp_mpm.mpmutils import poll_with_timeout -- cgit v1.2.3