diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-05-02 22:13:15 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:03:52 -0800 |
| commit | af35903d17d8cd314a2626f38eded72956459e23 (patch) | |
| tree | 0b047c2ede409cb3ccbccb3e87a570305ba75027 | |
| parent | 24d3011233ba1cd0b8788eccfacd0b67cb776600 (diff) | |
| download | uhd-af35903d17d8cd314a2626f38eded72956459e23.tar.gz uhd-af35903d17d8cd314a2626f38eded72956459e23.tar.bz2 uhd-af35903d17d8cd314a2626f38eded72956459e23.zip | |
mpm: Renamed types submodule mpmtypes to avoid import confusion
| -rw-r--r-- | mpm/python/usrp_mpm/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/__init__.py | 2 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/mpmtypes.py (renamed from mpm/python/usrp_mpm/types.py) | 0 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/periph_manager/__init__.py.in | 2 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/periph_manager/n310.py | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/mpm/python/usrp_mpm/CMakeLists.txt b/mpm/python/usrp_mpm/CMakeLists.txt index 44c70619f..e9e95555c 100644 --- a/mpm/python/usrp_mpm/CMakeLists.txt +++ b/mpm/python/usrp_mpm/CMakeLists.txt @@ -26,7 +26,7 @@ SET(USRP_MPM_TOP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/nijesdcore.py ${CMAKE_CURRENT_SOURCE_DIR}/rpc_server.py ${CMAKE_CURRENT_SOURCE_DIR}/sysfs_gpio.py - ${CMAKE_CURRENT_SOURCE_DIR}/types.py + ${CMAKE_CURRENT_SOURCE_DIR}/mpmtypes.py ${CMAKE_CURRENT_SOURCE_DIR}/uio.py ) LIST(APPEND USRP_MPM_FILES ${USRP_MPM_TOP_FILES}) diff --git a/mpm/python/usrp_mpm/__init__.py b/mpm/python/usrp_mpm/__init__.py index b91896542..29e0b1a09 100644 --- a/mpm/python/usrp_mpm/__init__.py +++ b/mpm/python/usrp_mpm/__init__.py @@ -20,7 +20,7 @@ MPM Module from .discovery import spawn_discovery_process from .rpc_server import spawn_rpc_process -from . import types +from . import mpmtypes from . import periph_manager from . import dboard_manager from .mpmlog import get_main_logger diff --git a/mpm/python/usrp_mpm/types.py b/mpm/python/usrp_mpm/mpmtypes.py index 1fbddb934..1fbddb934 100644 --- a/mpm/python/usrp_mpm/types.py +++ b/mpm/python/usrp_mpm/mpmtypes.py 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 |