Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions rtde/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
6 changes: 2 additions & 4 deletions rtde/csv_binary_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion rtde/csv_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 1 addition & 5 deletions rtde/csv_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@

import csv

import sys

sys.path.append("..")

from rtde import serialize
from . import serialize


class CSVWriter(object):
Expand Down
11 changes: 4 additions & 7 deletions rtde/rtde.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@
packages=["rtde"],
version=version,
description="Real-Time Data Exchange (RTDE) python client + examples",
install_requires=["numpy"],
)