Merge pull request #72 from ddemidov/issue-70

Move platform-guessing from __init__.py to auto.py

Author: rhempel

ev3dev/__init__.py

@@ -1,18 +0,0 @@
-import platform
-
-# -----------------------------------------------------------------------------
-# Guess platform we are running on
-def current_platform():
-    machine = platform.machine()
-    if machine == 'armv5tejl':
-        return 'ev3'
-    elif machine == 'armv6l':
-        return 'brickpi'
-    else:
-        return 'unsupported'
-
-if current_platform() == 'brickpi':
-    from .brickpi import *
-else:
-    # Import ev3 by default, so that it is covered by documentation.
-    from .ev3 import *

ev3dev/auto.py

@@ -0,0 +1,18 @@
+import platform
+
+# -----------------------------------------------------------------------------
+# Guess platform we are running on
+def current_platform():
+    machine = platform.machine()
+    if machine == 'armv5tejl':
+        return 'ev3'
+    elif machine == 'armv6l':
+        return 'brickpi'
+    else:
+        return 'unsupported'
+
+if current_platform() == 'brickpi':
+    from .brickpi import *
+else:
+    # Import ev3 by default, so that it is covered by documentation.
+    from .ev3 import *

tests/api_tests.py

@@ -3,32 +3,32 @@
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 
-import ev3dev
+import ev3dev.ev3 as ev3
 
-ev3dev.Device.DEVICE_ROOT_PATH = os.path.join(os.path.dirname(__file__), 'fake_sys_class')
+ev3.Device.DEVICE_ROOT_PATH = os.path.join(os.path.dirname(__file__), 'fake_sys_class')
 
 class TestAPI(unittest.TestCase):
     def test_device(self):
-        d = ev3dev.Device('tacho-motor', 'motor*')
+        d = ev3.Device('tacho-motor', 'motor*')
         self.assertTrue(d.connected)
 
-        d = ev3dev.Device('tacho-motor', 'motor0')
+        d = ev3.Device('tacho-motor', 'motor0')
         self.assertTrue(d.connected)
 
-        d = ev3dev.Device('tacho-motor', 'motor*', driver_name='lego-ev3-m-motor')
+        d = ev3.Device('tacho-motor', 'motor*', driver_name='lego-ev3-m-motor')
         self.assertTrue(d.connected)
 
-        d = ev3dev.Device('tacho-motor', 'motor*', port_name='outA')
+        d = ev3.Device('tacho-motor', 'motor*', port_name='outA')
         self.assertTrue(d.connected)
 
-        d = ev3dev.Device('tacho-motor', 'motor*', port_name='outA', driver_name='not-valid')
+        d = ev3.Device('tacho-motor', 'motor*', port_name='outA', driver_name='not-valid')
         self.assertTrue(not d.connected)
 
-        d = ev3dev.Device('lego-sensor', 'sensor*')
+        d = ev3.Device('lego-sensor', 'sensor*')
         self.assertTrue(d.connected)
 
     def test_medium_motor(self):
-        m = ev3dev.MediumMotor()
+        m = ev3.MediumMotor()
 
         self.assertTrue(m.connected);
 
@@ -52,15 +52,15 @@ def test_medium_motor(self):
         self.assertEqual(m.speed,                    0)
         self.assertEqual(m.speed_regulation_enabled, 'off')
         self.assertEqual(m.speed_sp,                 0)
-        self.assertEqual(m.state,                    [])
+        self.assertEqual(m.state,                    ['running'])
         self.assertEqual(m.stop_command,             'coast')
         self.assertEqual(m.time_sp,                  1000)
 
         with self.assertRaises(Exception):
             c = m.command
 
     def test_infrared_sensor(self):
-        s = ev3dev.InfraredSensor()
+        s = ev3.InfraredSensor()
 
         self.assertTrue(s.connected)
 

tests/fake_sys_class/tacho-motor/motor0/state

@@ -1 +1 @@
-
+running