summaryrefslogtreecommitdiff
path: root/host
diff options
context:
space:
mode:
Diffstat (limited to 'host')
-rw-r--r--host/inter/__init__.py0
-rw-r--r--host/inter/inter_node.py6
-rw-r--r--host/inter/test/test_drawable.py4
-rw-r--r--host/mex/__init__.py (renamed from host/mex/mex/__init__.py)0
-rw-r--r--host/mex/hub.py (renamed from host/mex/mex/hub.py)1
-rw-r--r--host/mex/msg.py (renamed from host/mex/mex/msg.py)0
-rw-r--r--host/mex/node.py (renamed from host/mex/mex/node.py)1
-rw-r--r--host/mex/test/test.py4
-rw-r--r--host/proto/__init__.py1
-rw-r--r--host/proto/test/asserv.py4
-rw-r--r--host/proto/test/interactive.py2
-rw-r--r--host/utils/__init__.py0
-rw-r--r--host/utils/forked.py (renamed from host/mex/mex/forked.py)0
13 files changed, 11 insertions, 12 deletions
diff --git a/host/inter/__init__.py b/host/inter/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/host/inter/__init__.py
diff --git a/host/inter/inter_node.py b/host/inter/inter_node.py
index 8e51b953..96648c6f 100644
--- a/host/inter/inter_node.py
+++ b/host/inter/inter_node.py
@@ -24,7 +24,7 @@
"""Inter, coupled with a mex Node."""
if __name__ == '__main__':
import sys
- sys.path.append (sys.path[0] + '/../mex')
+ sys.path.append (sys.path[0] + '/..')
from inter import Inter, Obstacle
from dist_sensor import DistSensor
@@ -206,9 +206,9 @@ class InterNode (Inter):
if __name__ == '__main__':
import mex.hub
- import mex.forked
+ import utils.forked
h = mex.hub.Hub (min_clients = 1)
- fh = mex.forked.Forked (h.wait)
+ fh = utils.forked.Forked (h.wait)
try:
app = InterNode ()
app.mainloop()
diff --git a/host/inter/test/test_drawable.py b/host/inter/test/test_drawable.py
index 31200252..79948e12 100644
--- a/host/inter/test/test_drawable.py
+++ b/host/inter/test/test_drawable.py
@@ -1,7 +1,7 @@
import sys
-sys.path.append (sys.path[0] + '/..')
+sys.path.append (sys.path[0] + '/../..')
-from drawable import *
+from inter.drawable import *
from math import pi
class Test (Drawable):
diff --git a/host/mex/mex/__init__.py b/host/mex/__init__.py
index 17a462a3..17a462a3 100644
--- a/host/mex/mex/__init__.py
+++ b/host/mex/__init__.py
diff --git a/host/mex/mex/hub.py b/host/mex/hub.py
index a3dd785b..5ae88ba7 100644
--- a/host/mex/mex/hub.py
+++ b/host/mex/hub.py
@@ -24,7 +24,6 @@
"""mex Hub."""
import mex
from msg import Msg
-import msg
import socket, select
from struct import pack, unpack, calcsize
diff --git a/host/mex/mex/msg.py b/host/mex/msg.py
index 5399a3c9..5399a3c9 100644
--- a/host/mex/mex/msg.py
+++ b/host/mex/msg.py
diff --git a/host/mex/mex/node.py b/host/mex/node.py
index e54d1ba6..3307a4d7 100644
--- a/host/mex/mex/node.py
+++ b/host/mex/node.py
@@ -24,7 +24,6 @@
"""mex Node."""
import mex
from msg import Msg
-import msg
import socket
from struct import pack, unpack, calcsize
diff --git a/host/mex/test/test.py b/host/mex/test/test.py
index bdb705a2..c4382c2c 100644
--- a/host/mex/test/test.py
+++ b/host/mex/test/test.py
@@ -1,10 +1,10 @@
import sys
-sys.path.append (sys.path[0] + '/..')
+sys.path.append (sys.path[0] + '/../..')
from mex.hub import Hub
from mex.node import Node
from mex.msg import Msg
-from mex.forked import Forked
+from utils.forked import Forked
import select
def log (x):
diff --git a/host/proto/__init__.py b/host/proto/__init__.py
new file mode 100644
index 00000000..ef19037a
--- /dev/null
+++ b/host/proto/__init__.py
@@ -0,0 +1 @@
+from proto import Proto
diff --git a/host/proto/test/asserv.py b/host/proto/test/asserv.py
index 265f0815..1628c27d 100644
--- a/host/proto/test/asserv.py
+++ b/host/proto/test/asserv.py
@@ -1,8 +1,8 @@
import sys
-sys.path.append (sys.path[0] + '/..')
+sys.path.append (sys.path[0] + '/../..')
import proto
-from popen_io import PopenIO
+from proto.popen_io import PopenIO
import time, select, os
# Pass program name as argument.
diff --git a/host/proto/test/interactive.py b/host/proto/test/interactive.py
index f68dd121..a8251f6d 100644
--- a/host/proto/test/interactive.py
+++ b/host/proto/test/interactive.py
@@ -1,5 +1,5 @@
import sys
-sys.path.append (sys.path[0] + '/..')
+sys.path.append (sys.path[0] + '/../..')
import proto
from fio import IO
diff --git a/host/utils/__init__.py b/host/utils/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/host/utils/__init__.py
diff --git a/host/mex/mex/forked.py b/host/utils/forked.py
index 9e72d7d3..9e72d7d3 100644
--- a/host/mex/mex/forked.py
+++ b/host/utils/forked.py