Removed sortOutPythonPaths.py to make example code stand-alone

Charles Weir · Charles Weir · commit 4af92dd7c4d4 · 2014-03-02T23:10:50.000Z
diff --git a/ExamplePrograms/DoorControl.py b/ExamplePrograms/DoorControl.py
@@ -3,7 +3,9 @@
 #
 # Copyright (c) 2014 Charles Weir.  Shared under the MIT Licence.
 
-import sortOutPythonPaths
+import sys, os # Python path kludge - omit these 2 lines if BrickPython is installed.
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))))
+
 from BrickPython.TkApplication import TkApplication
 from BrickPython.Sensor import Sensor
 import logging
diff --git a/ExamplePrograms/MotorController.py b/ExamplePrograms/MotorController.py
@@ -3,7 +3,9 @@
 #
 # Copyright (c) 2014 Charles Weir.  Shared under the MIT Licence.
 
-import sortOutPythonPaths
+import sys, os # Python path kludge - omit these 2 lines if BrickPython is installed.
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))))
+
 from BrickPython.TkApplication import TkApplication
 from BrickPython.Motor import PIDSetting
 from BrickPython.Sensor import Sensor
diff --git a/ExamplePrograms/SimpleApp.py b/ExamplePrograms/SimpleApp.py
@@ -2,8 +2,10 @@
 #
 # Copyright (c) 2014 Charles Weir.  Shared under the MIT Licence.
 
-import sortOutPythonPaths
-from BrickPython.CommandLineApplication import *
+import sys, os # Python path kludge - omit these 2 lines if BrickPython is installed.
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))))
+
+from BrickPython.CommandLineApplication import CommandLineApplication
 
 class SimpleApp(CommandLineApplication):
     'Simple command line example application'
diff --git a/ExamplePrograms/sortOutPythonPaths.py b/ExamplePrograms/sortOutPythonPaths.py
diff --git a/doBuild b/doBuild
@@ -14,4 +14,4 @@ python setup.py test
 echo '>> Upload docs to pypi from' `pwd`/docs/generated/Archive.zip
 echo '>> Form at the bottom of https://pypi.python.org/pypi?%3Aaction=pkg_edit&name=BrickPython'
 echo '>> To release module to pypi:  python setup.py sdist upload'
-echo '>> To install without releasing: pip install -e .'
+echo '>> To install without releasing: sudo pip install -e .'
