From 3e072130b7d441b1a875fc7d9bddc92d66348db9 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 27 Jun 2017 18:16:43 -0500 Subject: [PATCH 1/5] feat(API): Add `System` objects --- nixnet/nx.py | 15 ------ nixnet/system/__init__.py | 12 +++++ nixnet/system/device.py | 62 ++++++++++++++++++++++ nixnet/system/interface.py | 82 ++++++++++++++++++++++++++++ nixnet/system/system.py | 106 +++++++++++++++++++++++++++++++++++++ 5 files changed, 262 insertions(+), 15 deletions(-) create mode 100644 nixnet/system/__init__.py create mode 100644 nixnet/system/device.py create mode 100644 nixnet/system/interface.py create mode 100644 nixnet/system/system.py diff --git a/nixnet/nx.py b/nixnet/nx.py index 855948a5..eb3d3380 100644 --- a/nixnet/nx.py +++ b/nixnet/nx.py @@ -885,12 +885,6 @@ def convert_signals_to_frames_single_point( raise NotImplementedError("Placeholder") -def blink( - interface_ref, - modifier): - _funcs.nx_blink(interface_ref, modifier) - - def clear( session_ref): _funcs.nx_clear(session_ref) @@ -927,15 +921,6 @@ def stop( _funcs.nx_stop(session_ref, scope) -def system_open(): - return _funcs.nx_system_open() - - -def system_close( - system_ref): - _funcs.nx_system_open(system_ref) - - def wait( session_ref, condition, diff --git a/nixnet/system/__init__.py b/nixnet/system/__init__.py new file mode 100644 index 00000000..9c796cf7 --- /dev/null +++ b/nixnet/system/__init__.py @@ -0,0 +1,12 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + + +from nixnet.system.device import Device +from nixnet.system.interface import Interface +from nixnet.system.system import System + + +__all__ = ["System", "Device", "Interface"] diff --git a/nixnet/system/device.py b/nixnet/system/device.py new file mode 100644 index 00000000..a923bd95 --- /dev/null +++ b/nixnet/system/device.py @@ -0,0 +1,62 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from nixnet import _props + + +class Device(object): + + def __init__(self, handle): + self._handle = handle + + def __eq__(self, other): + if isinstance(other, self.__class__): + return self._handle == other._handle + return False + + def __ne__(self, other): + return not self.__eq__(other) + + def __hash__(self): + return hash(self._handle) + + def __repr__(self): + return 'Device(handle={0})'.format(self._handle) + + @property + def form_fac(self): + return _props.get_device_form_fac(self._handle) + + @property + def intf_refs(self): + return _props.get_device_intf_refs(self._handle) + + @property + def name(self): + return _props.get_device_name(self._handle) + + @property + def num_ports(self): + return _props.get_device_num_ports(self._handle) + + @property + def product_num(self): + return _props.get_device_product_num(self._handle) + + @property + def ser_num(self): + return _props.get_device_ser_num(self._handle) + + @property + def slot_num(self): + return _props.get_device_slot_num(self._handle) + + @property + def num_ports_all(self): + return _props.get_device_num_ports_all(self._handle) + + @property + def intf_refs_all(self): + return _props.get_device_intf_refs_all(self._handle) diff --git a/nixnet/system/interface.py b/nixnet/system/interface.py new file mode 100644 index 00000000..75332122 --- /dev/null +++ b/nixnet/system/interface.py @@ -0,0 +1,82 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from nixnet import _funcs +from nixnet import _props + + +class Interface(object): + + def __init__(self, handle): + self._handle = handle + + def __eq__(self, other): + if isinstance(other, self.__class__): + return self._handle == other._handle + return False + + def __ne__(self, other): + return not self.__eq__(other) + + def __hash__(self): + return hash(self._handle) + + def __repr__(self): + return 'Interface(handle={0})'.format(self._handle) + + @property + def dev_ref(self): + return _props.get_interface_dev_ref(self._handle) + + @property + def name(self): + return _props.get_interface_name(self._handle) + + @property + def num(self): + return _props.get_interface_num(self._handle) + + @property + def port_num(self): + return _props.get_interface_port_num(self._handle) + + @property + def protocol(self): + return _props.get_interface_protocol(self._handle) + + @property + def can_term_cap(self): + return _props.get_interface_can_term_cap(self._handle) + + @property + def can_tcvr_cap(self): + return _props.get_interface_can_tcvr_cap(self._handle) + + @property + def dongle_state(self): + return _props.get_interface_dongle_state(self._handle) + + @property + def dongle_id(self): + return _props.get_interface_dongle_id(self._handle) + + @property + def dongle_revision(self): + return _props.get_interface_dongle_revision(self._handle) + + @property + def dongle_firmware_version(self): + return _props.get_interface_dongle_firmware_version(self._handle) + + @property + def dongle_compatible_revision(self): + return _props.get_interface_dongle_compatible_revision(self._handle) + + @property + def dongle_compatible_firmware_version(self): + return _props.get_interface_dongle_compatible_firmware_version(self._handle) + + def blink(self, modifier): + _funcs.nx_blink(self._handle, modifier) diff --git a/nixnet/system/system.py b/nixnet/system/system.py new file mode 100644 index 00000000..7f74e11b --- /dev/null +++ b/nixnet/system/system.py @@ -0,0 +1,106 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +import warnings + +from nixnet import _funcs +from nixnet import _props +from nixnet import errors + + +class System(object): + + def __init__(self): + self._handle = _funcs.nx_system_open() + + def __del__(self): + if self._handle is not None: + warnings.warn( + 'System was not explicitly closed before it was destructed. ' + 'Resources on the device may still be reserved.', + errors.XnetResourceWarning) + + def __enter__(self): + return self + + def __exit__(self): + self.close() + + def __eq__(self, other): + if isinstance(other, self.__class__): + return self._handle == other._handle + return False + + def __ne__(self, other): + return not self.__eq__(other) + + def __hash__(self): + return hash(self._handle) + + def __repr__(self): + return 'System(handle={0})'.format(self._handle) + + def close(self): + if self._handle is None: + warnings.warn( + 'Attempting to close NI-XNET system but system was already ' + 'closed', errors.XnetResourceWarning) + return + + _funcs.nx_system_close(self._handle) + + self._handle = None + + @property + def dev_refs(self): + return _props.get_system_dev_refs(self._handle) + + @property + def intf_refs(self): + return _props.get_system_intf_refs(self._handle) + + @property + def intf_refs_can(self): + return _props.get_system_intf_refs_can(self._handle) + + @property + def intf_refs_flex_ray(self): + return _props.get_system_intf_refs_flex_ray(self._handle) + + @property + def intf_refs_lin(self): + return _props.get_system_intf_refs_lin(self._handle) + + @property + def ver_build(self): + return _props.get_system_ver_build(self._handle) + + @property + def ver_major(self): + return _props.get_system_ver_major(self._handle) + + @property + def ver_minor(self): + return _props.get_system_ver_minor(self._handle) + + @property + def ver_phase(self): + return _props.get_system_ver_phase(self._handle) + + @property + def ver_update(self): + return _props.get_system_ver_update(self._handle) + + @property + def cdaq_pkt_time(self): + return _props.get_system_cdaq_pkt_time(self._handle) + + @cdaq_pkt_time.setter + def cdaq_pkt_time(self, value): + _props.set_system_cdaq_pkt_time(self._handle, value) + + @property + def intf_refs_all(self): + return _props.get_system_intf_refs_all(self._handle) From 92dd570e6eb640f8ce17f499f72585909e7259a5 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 27 Jun 2017 18:23:06 -0500 Subject: [PATCH 2/5] feat(API): Use enums with Session properties --- nixnet/system/device.py | 3 ++- nixnet/system/interface.py | 11 ++++++----- nixnet/system/system.py | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/nixnet/system/device.py b/nixnet/system/device.py index a923bd95..ceae0de6 100644 --- a/nixnet/system/device.py +++ b/nixnet/system/device.py @@ -3,6 +3,7 @@ from __future__ import print_function from __future__ import unicode_literals +from nixnet import constants from nixnet import _props @@ -27,7 +28,7 @@ def __repr__(self): @property def form_fac(self): - return _props.get_device_form_fac(self._handle) + return constants.DevForm(_props.get_device_form_fac(self._handle)) @property def intf_refs(self): diff --git a/nixnet/system/interface.py b/nixnet/system/interface.py index 75332122..11d1566c 100644 --- a/nixnet/system/interface.py +++ b/nixnet/system/interface.py @@ -3,6 +3,7 @@ from __future__ import print_function from __future__ import unicode_literals +from nixnet import constants from nixnet import _funcs from nixnet import _props @@ -44,23 +45,23 @@ def port_num(self): @property def protocol(self): - return _props.get_interface_protocol(self._handle) + return constants.Protocol(_props.get_interface_protocol(self._handle)) @property def can_term_cap(self): - return _props.get_interface_can_term_cap(self._handle) + return constants.CanTermCap(_props.get_interface_can_term_cap(self._handle)) @property def can_tcvr_cap(self): - return _props.get_interface_can_tcvr_cap(self._handle) + return constants.CanTcvrCap(_props.get_interface_can_tcvr_cap(self._handle)) @property def dongle_state(self): - return _props.get_interface_dongle_state(self._handle) + return constants.DongleState(_props.get_interface_dongle_state(self._handle)) @property def dongle_id(self): - return _props.get_interface_dongle_id(self._handle) + return constants.DongleId(_props.get_interface_dongle_id(self._handle)) @property def dongle_revision(self): diff --git a/nixnet/system/system.py b/nixnet/system/system.py index 7f74e11b..d88cd7df 100644 --- a/nixnet/system/system.py +++ b/nixnet/system/system.py @@ -5,6 +5,7 @@ import warnings +import constants from nixnet import _funcs from nixnet import _props from nixnet import errors @@ -87,7 +88,7 @@ def ver_minor(self): @property def ver_phase(self): - return _props.get_system_ver_phase(self._handle) + return constants.Phase(_props.get_system_ver_phase(self._handle)) @property def ver_update(self): From 6b0e234d2f1735f511b109508767f15389c5a021 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 27 Jun 2017 18:23:55 -0500 Subject: [PATCH 3/5] style: Clean up line endings --- nixnet/system/__init__.py | 24 ++--- nixnet/system/device.py | 126 +++++++++++----------- nixnet/system/interface.py | 166 ++++++++++++++-------------- nixnet/system/system.py | 214 ++++++++++++++++++------------------- 4 files changed, 265 insertions(+), 265 deletions(-) diff --git a/nixnet/system/__init__.py b/nixnet/system/__init__.py index 9c796cf7..57c942ea 100644 --- a/nixnet/system/__init__.py +++ b/nixnet/system/__init__.py @@ -1,12 +1,12 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - - -from nixnet.system.device import Device -from nixnet.system.interface import Interface -from nixnet.system.system import System - - -__all__ = ["System", "Device", "Interface"] +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + + +from nixnet.system.device import Device +from nixnet.system.interface import Interface +from nixnet.system.system import System + + +__all__ = ["System", "Device", "Interface"] diff --git a/nixnet/system/device.py b/nixnet/system/device.py index ceae0de6..c1ae7802 100644 --- a/nixnet/system/device.py +++ b/nixnet/system/device.py @@ -1,63 +1,63 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -from nixnet import constants -from nixnet import _props - - -class Device(object): - - def __init__(self, handle): - self._handle = handle - - def __eq__(self, other): - if isinstance(other, self.__class__): - return self._handle == other._handle - return False - - def __ne__(self, other): - return not self.__eq__(other) - - def __hash__(self): - return hash(self._handle) - - def __repr__(self): - return 'Device(handle={0})'.format(self._handle) - - @property - def form_fac(self): - return constants.DevForm(_props.get_device_form_fac(self._handle)) - - @property - def intf_refs(self): - return _props.get_device_intf_refs(self._handle) - - @property - def name(self): - return _props.get_device_name(self._handle) - - @property - def num_ports(self): - return _props.get_device_num_ports(self._handle) - - @property - def product_num(self): - return _props.get_device_product_num(self._handle) - - @property - def ser_num(self): - return _props.get_device_ser_num(self._handle) - - @property - def slot_num(self): - return _props.get_device_slot_num(self._handle) - - @property - def num_ports_all(self): - return _props.get_device_num_ports_all(self._handle) - - @property - def intf_refs_all(self): - return _props.get_device_intf_refs_all(self._handle) +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from nixnet import constants +from nixnet import _props + + +class Device(object): + + def __init__(self, handle): + self._handle = handle + + def __eq__(self, other): + if isinstance(other, self.__class__): + return self._handle == other._handle + return False + + def __ne__(self, other): + return not self.__eq__(other) + + def __hash__(self): + return hash(self._handle) + + def __repr__(self): + return 'Device(handle={0})'.format(self._handle) + + @property + def form_fac(self): + return constants.DevForm(_props.get_device_form_fac(self._handle)) + + @property + def intf_refs(self): + return _props.get_device_intf_refs(self._handle) + + @property + def name(self): + return _props.get_device_name(self._handle) + + @property + def num_ports(self): + return _props.get_device_num_ports(self._handle) + + @property + def product_num(self): + return _props.get_device_product_num(self._handle) + + @property + def ser_num(self): + return _props.get_device_ser_num(self._handle) + + @property + def slot_num(self): + return _props.get_device_slot_num(self._handle) + + @property + def num_ports_all(self): + return _props.get_device_num_ports_all(self._handle) + + @property + def intf_refs_all(self): + return _props.get_device_intf_refs_all(self._handle) diff --git a/nixnet/system/interface.py b/nixnet/system/interface.py index 11d1566c..36b29aed 100644 --- a/nixnet/system/interface.py +++ b/nixnet/system/interface.py @@ -1,83 +1,83 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -from nixnet import constants -from nixnet import _funcs -from nixnet import _props - - -class Interface(object): - - def __init__(self, handle): - self._handle = handle - - def __eq__(self, other): - if isinstance(other, self.__class__): - return self._handle == other._handle - return False - - def __ne__(self, other): - return not self.__eq__(other) - - def __hash__(self): - return hash(self._handle) - - def __repr__(self): - return 'Interface(handle={0})'.format(self._handle) - - @property - def dev_ref(self): - return _props.get_interface_dev_ref(self._handle) - - @property - def name(self): - return _props.get_interface_name(self._handle) - - @property - def num(self): - return _props.get_interface_num(self._handle) - - @property - def port_num(self): - return _props.get_interface_port_num(self._handle) - - @property - def protocol(self): - return constants.Protocol(_props.get_interface_protocol(self._handle)) - - @property - def can_term_cap(self): - return constants.CanTermCap(_props.get_interface_can_term_cap(self._handle)) - - @property - def can_tcvr_cap(self): - return constants.CanTcvrCap(_props.get_interface_can_tcvr_cap(self._handle)) - - @property - def dongle_state(self): - return constants.DongleState(_props.get_interface_dongle_state(self._handle)) - - @property - def dongle_id(self): - return constants.DongleId(_props.get_interface_dongle_id(self._handle)) - - @property - def dongle_revision(self): - return _props.get_interface_dongle_revision(self._handle) - - @property - def dongle_firmware_version(self): - return _props.get_interface_dongle_firmware_version(self._handle) - - @property - def dongle_compatible_revision(self): - return _props.get_interface_dongle_compatible_revision(self._handle) - - @property - def dongle_compatible_firmware_version(self): - return _props.get_interface_dongle_compatible_firmware_version(self._handle) - - def blink(self, modifier): - _funcs.nx_blink(self._handle, modifier) +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from nixnet import constants +from nixnet import _funcs +from nixnet import _props + + +class Interface(object): + + def __init__(self, handle): + self._handle = handle + + def __eq__(self, other): + if isinstance(other, self.__class__): + return self._handle == other._handle + return False + + def __ne__(self, other): + return not self.__eq__(other) + + def __hash__(self): + return hash(self._handle) + + def __repr__(self): + return 'Interface(handle={0})'.format(self._handle) + + @property + def dev_ref(self): + return _props.get_interface_dev_ref(self._handle) + + @property + def name(self): + return _props.get_interface_name(self._handle) + + @property + def num(self): + return _props.get_interface_num(self._handle) + + @property + def port_num(self): + return _props.get_interface_port_num(self._handle) + + @property + def protocol(self): + return constants.Protocol(_props.get_interface_protocol(self._handle)) + + @property + def can_term_cap(self): + return constants.CanTermCap(_props.get_interface_can_term_cap(self._handle)) + + @property + def can_tcvr_cap(self): + return constants.CanTcvrCap(_props.get_interface_can_tcvr_cap(self._handle)) + + @property + def dongle_state(self): + return constants.DongleState(_props.get_interface_dongle_state(self._handle)) + + @property + def dongle_id(self): + return constants.DongleId(_props.get_interface_dongle_id(self._handle)) + + @property + def dongle_revision(self): + return _props.get_interface_dongle_revision(self._handle) + + @property + def dongle_firmware_version(self): + return _props.get_interface_dongle_firmware_version(self._handle) + + @property + def dongle_compatible_revision(self): + return _props.get_interface_dongle_compatible_revision(self._handle) + + @property + def dongle_compatible_firmware_version(self): + return _props.get_interface_dongle_compatible_firmware_version(self._handle) + + def blink(self, modifier): + _funcs.nx_blink(self._handle, modifier) diff --git a/nixnet/system/system.py b/nixnet/system/system.py index d88cd7df..dfdade0e 100644 --- a/nixnet/system/system.py +++ b/nixnet/system/system.py @@ -1,107 +1,107 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -import warnings - -import constants -from nixnet import _funcs -from nixnet import _props -from nixnet import errors - - -class System(object): - - def __init__(self): - self._handle = _funcs.nx_system_open() - - def __del__(self): - if self._handle is not None: - warnings.warn( - 'System was not explicitly closed before it was destructed. ' - 'Resources on the device may still be reserved.', - errors.XnetResourceWarning) - - def __enter__(self): - return self - - def __exit__(self): - self.close() - - def __eq__(self, other): - if isinstance(other, self.__class__): - return self._handle == other._handle - return False - - def __ne__(self, other): - return not self.__eq__(other) - - def __hash__(self): - return hash(self._handle) - - def __repr__(self): - return 'System(handle={0})'.format(self._handle) - - def close(self): - if self._handle is None: - warnings.warn( - 'Attempting to close NI-XNET system but system was already ' - 'closed', errors.XnetResourceWarning) - return - - _funcs.nx_system_close(self._handle) - - self._handle = None - - @property - def dev_refs(self): - return _props.get_system_dev_refs(self._handle) - - @property - def intf_refs(self): - return _props.get_system_intf_refs(self._handle) - - @property - def intf_refs_can(self): - return _props.get_system_intf_refs_can(self._handle) - - @property - def intf_refs_flex_ray(self): - return _props.get_system_intf_refs_flex_ray(self._handle) - - @property - def intf_refs_lin(self): - return _props.get_system_intf_refs_lin(self._handle) - - @property - def ver_build(self): - return _props.get_system_ver_build(self._handle) - - @property - def ver_major(self): - return _props.get_system_ver_major(self._handle) - - @property - def ver_minor(self): - return _props.get_system_ver_minor(self._handle) - - @property - def ver_phase(self): - return constants.Phase(_props.get_system_ver_phase(self._handle)) - - @property - def ver_update(self): - return _props.get_system_ver_update(self._handle) - - @property - def cdaq_pkt_time(self): - return _props.get_system_cdaq_pkt_time(self._handle) - - @cdaq_pkt_time.setter - def cdaq_pkt_time(self, value): - _props.set_system_cdaq_pkt_time(self._handle, value) - - @property - def intf_refs_all(self): - return _props.get_system_intf_refs_all(self._handle) +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +import warnings + +import constants +from nixnet import _funcs +from nixnet import _props +from nixnet import errors + + +class System(object): + + def __init__(self): + self._handle = _funcs.nx_system_open() + + def __del__(self): + if self._handle is not None: + warnings.warn( + 'System was not explicitly closed before it was destructed. ' + 'Resources on the device may still be reserved.', + errors.XnetResourceWarning) + + def __enter__(self): + return self + + def __exit__(self): + self.close() + + def __eq__(self, other): + if isinstance(other, self.__class__): + return self._handle == other._handle + return False + + def __ne__(self, other): + return not self.__eq__(other) + + def __hash__(self): + return hash(self._handle) + + def __repr__(self): + return 'System(handle={0})'.format(self._handle) + + def close(self): + if self._handle is None: + warnings.warn( + 'Attempting to close NI-XNET system but system was already ' + 'closed', errors.XnetResourceWarning) + return + + _funcs.nx_system_close(self._handle) + + self._handle = None + + @property + def dev_refs(self): + return _props.get_system_dev_refs(self._handle) + + @property + def intf_refs(self): + return _props.get_system_intf_refs(self._handle) + + @property + def intf_refs_can(self): + return _props.get_system_intf_refs_can(self._handle) + + @property + def intf_refs_flex_ray(self): + return _props.get_system_intf_refs_flex_ray(self._handle) + + @property + def intf_refs_lin(self): + return _props.get_system_intf_refs_lin(self._handle) + + @property + def ver_build(self): + return _props.get_system_ver_build(self._handle) + + @property + def ver_major(self): + return _props.get_system_ver_major(self._handle) + + @property + def ver_minor(self): + return _props.get_system_ver_minor(self._handle) + + @property + def ver_phase(self): + return constants.Phase(_props.get_system_ver_phase(self._handle)) + + @property + def ver_update(self): + return _props.get_system_ver_update(self._handle) + + @property + def cdaq_pkt_time(self): + return _props.get_system_cdaq_pkt_time(self._handle) + + @cdaq_pkt_time.setter + def cdaq_pkt_time(self, value): + _props.set_system_cdaq_pkt_time(self._handle, value) + + @property + def intf_refs_all(self): + return _props.get_system_intf_refs_all(self._handle) From 58e899c57151138a3d5199e5b97bbbf8a1f1009e Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 27 Jun 2017 18:29:17 -0500 Subject: [PATCH 4/5] fix: Correct import path for constants --- nixnet/system/system.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixnet/system/system.py b/nixnet/system/system.py index dfdade0e..e7b583ed 100644 --- a/nixnet/system/system.py +++ b/nixnet/system/system.py @@ -5,7 +5,7 @@ import warnings -import constants +from nixnet import constants from nixnet import _funcs from nixnet import _props from nixnet import errors From 48395e25bcb9b5c02a5be22297fb4b65f46d3ac2 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 27 Jun 2017 18:32:47 -0500 Subject: [PATCH 5/5] style: Correct the import order --- nixnet/system/device.py | 2 +- nixnet/system/interface.py | 2 +- nixnet/system/system.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixnet/system/device.py b/nixnet/system/device.py index c1ae7802..fd913ef1 100644 --- a/nixnet/system/device.py +++ b/nixnet/system/device.py @@ -3,8 +3,8 @@ from __future__ import print_function from __future__ import unicode_literals -from nixnet import constants from nixnet import _props +from nixnet import constants class Device(object): diff --git a/nixnet/system/interface.py b/nixnet/system/interface.py index 36b29aed..1e220fd7 100644 --- a/nixnet/system/interface.py +++ b/nixnet/system/interface.py @@ -3,9 +3,9 @@ from __future__ import print_function from __future__ import unicode_literals -from nixnet import constants from nixnet import _funcs from nixnet import _props +from nixnet import constants class Interface(object): diff --git a/nixnet/system/system.py b/nixnet/system/system.py index e7b583ed..3b7eb8c5 100644 --- a/nixnet/system/system.py +++ b/nixnet/system/system.py @@ -5,9 +5,9 @@ import warnings -from nixnet import constants from nixnet import _funcs from nixnet import _props +from nixnet import constants from nixnet import errors