diff --git a/rtde/__init__.py b/rtde/__init__.py index 4393e42..7bec406 100644 --- a/rtde/__init__.py +++ b/rtde/__init__.py @@ -20,6 +20,3 @@ # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -from .rtde import * -from .rtde_config import * diff --git a/rtde/csv_binary_writer.py b/rtde/csv_binary_writer.py index 45a06b5..f507834 100644 --- a/rtde/csv_binary_writer.py +++ b/rtde/csv_binary_writer.py @@ -21,12 +21,10 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import struct import sys -sys.path.append("..") - -import struct -from rtde import serialize +from . import serialize class CSVBinaryWriter(object): diff --git a/rtde/csv_reader.py b/rtde/csv_reader.py index b31ea08..d307168 100644 --- a/rtde/csv_reader.py +++ b/rtde/csv_reader.py @@ -22,9 +22,10 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import csv -import numpy as np import logging +import numpy as np + from .rtde import LOGNAME _log = logging.getLogger(LOGNAME) diff --git a/rtde/csv_writer.py b/rtde/csv_writer.py index 5c2b281..cbb5189 100644 --- a/rtde/csv_writer.py +++ b/rtde/csv_writer.py @@ -23,11 +23,7 @@ import csv -import sys - -sys.path.append("..") - -from rtde import serialize +from . import serialize class CSVWriter(object): diff --git a/rtde/rtde.py b/rtde/rtde.py index 4c09ce6..6ffaf8c 100644 --- a/rtde/rtde.py +++ b/rtde/rtde.py @@ -21,16 +21,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import struct -import socket +import logging import select +import socket +import struct import sys -import logging -if sys.version_info[0] < 3: - import serialize -else: - from rtde import serialize +from . import serialize DEFAULT_TIMEOUT = 1.0 diff --git a/setup.py b/setup.py index 40e9878..c3f73a3 100644 --- a/setup.py +++ b/setup.py @@ -34,4 +34,5 @@ packages=["rtde"], version=version, description="Real-Time Data Exchange (RTDE) python client + examples", + install_requires=["numpy"], )