Put the viewer script back into the CAN module

Lauszus · Lauszus · commit 9b397d105b66 · 2018-09-09T17:22:04.000+02:00
diff --git a/can/viewer.py b/can/viewer.py
diff --git a/scripts/can_viewer.py b/scripts/can_viewer.py
@@ -2,12 +2,12 @@
 # coding: utf-8
 
 """
-See :mod:`can.scripts.viewer`.
+See :mod:`can.viewer`.
 """
 
 from __future__ import absolute_import
 
-from can.scripts.viewer import main
+from can.viewer import main
 
 
 if __name__ == "__main__":
diff --git a/test/test_viewer.py b/test/test_viewer.py
@@ -32,7 +32,7 @@
 except ImportError:
     from mock import Mock, patch
 
-from can.scripts.viewer import KEY_ESC, KEY_SPACE, CanViewer, canopen_function_codes, CANOPEN_NMT, CANOPEN_SYNC_EMCY, \
+from can.viewer import KEY_ESC, KEY_SPACE, CanViewer, canopen_function_codes, CANOPEN_NMT, CANOPEN_SYNC_EMCY, \
     CANOPEN_TIME, CANOPEN_TPDO1, CANOPEN_RPDO1, CANOPEN_TPDO2, CANOPEN_RPDO2, CANOPEN_TPDO3, CANOPEN_RPDO3, \
     CANOPEN_TPDO4, CANOPEN_RPDO4, CANOPEN_SDO_TX, CANOPEN_SDO_RX, CANOPEN_HEARTBEAT, CANOPEN_LSS_TX, CANOPEN_LSS_RX, \
     parse_args
