CW: Sorted out package imports; got nosetests and apps running.

Charles Weir · Charles Weir · commit 44257359bcf0 · 2014-02-15T21:30:09.000Z
diff --git a/ExamplePrograms/DoorControl.py b/ExamplePrograms/DoorControl.py
@@ -5,7 +5,7 @@
 # The door is attached to a motor, which opens it by moving through 90 degrees, and closes it the same way.
 # The sensor is mounted above the door, so it detects approaching 'peaple'.
 
-from TkApplication import *
+from BrickPython.TkApplication import *
 
 
 class DoorControlApp(TkApplication):
diff --git a/ExamplePrograms/MotorController.py b/ExamplePrograms/MotorController.py
@@ -13,7 +13,7 @@
 #   Z,z increase and decrease the 'Integrated distance multimplier' - the I setting.
 
 
-from TkApplication import *
+from BrickPython.TkApplication import *
 
 
 class MyApp(TkApplication):
diff --git a/test/TestBrickPiWrapper.py b/test/TestBrickPiWrapper.py
@@ -11,10 +11,11 @@
 
 
 
-from BrickPiWrapper import *
+from BrickPython.BrickPiWrapper import *
+from BrickPython.Sensor import *
 import unittest
 from mock import *
-from Sensor import *
+
 
 
 class TestBrickPiWrapper(unittest.TestCase):
diff --git a/test/TestMotor.py b/test/TestMotor.py
@@ -11,7 +11,7 @@
 
 
 
-from BrickPiWrapper import *
+from BrickPython.BrickPiWrapper import *
 import unittest
 from mock import *
 
diff --git a/test/TestScheduler.py b/test/TestScheduler.py
@@ -11,7 +11,7 @@
 
 
 
-from BrickPiWrapper import *
+from BrickPython.BrickPiWrapper import *
 import unittest
 from mock import *
 
diff --git a/test/TestSensor.py b/test/TestSensor.py
@@ -11,11 +11,11 @@
 
 
 
-from BrickPiWrapper import *
 import unittest
-from Sensor import *
+from BrickPython.BrickPiWrapper import *
+from BrickPython.Sensor import *
 
-class SensorTests(unittest.TestCase):
+class TestSensor(unittest.TestCase):
     global Sensor
 
     def testSensor(self):
