From af35903d17d8cd314a2626f38eded72956459e23 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 2 May 2017 22:13:15 -0700 Subject: mpm: Renamed types submodule mpmtypes to avoid import confusion --- mpm/python/usrp_mpm/periph_manager/__init__.py.in | 2 +- mpm/python/usrp_mpm/periph_manager/n310.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mpm/python/usrp_mpm/periph_manager') diff --git a/mpm/python/usrp_mpm/periph_manager/__init__.py.in b/mpm/python/usrp_mpm/periph_manager/__init__.py.in index c2dd7927c..34d29137a 100644 --- a/mpm/python/usrp_mpm/periph_manager/__init__.py.in +++ b/mpm/python/usrp_mpm/periph_manager/__init__.py.in @@ -21,6 +21,6 @@ periph_manager __init__.py # This is where the import magic happens from .. import libpyusrp_periphs as lib from .. import dboard_manager -from .. import types +from .. import mpmtypes from .${MPM_DEVICE} import ${MPM_DEVICE} as periph_manager diff --git a/mpm/python/usrp_mpm/periph_manager/n310.py b/mpm/python/usrp_mpm/periph_manager/n310.py index 56dba2ca8..8cc33cc9c 100644 --- a/mpm/python/usrp_mpm/periph_manager/n310.py +++ b/mpm/python/usrp_mpm/periph_manager/n310.py @@ -25,7 +25,7 @@ from .base import PeriphManagerBase from .net import get_iface_addrs from .net import byte_to_mac from .net import get_mac_addr -from ..types import SID +from ..mpmtypes import SID from ..uio import UIO from ..sysfs_gpio import SysFSGPIO from .. import libpyusrp_periphs as lib -- cgit v1.2.3