python: Added upm directory for python modules

* Grouped UPM python modules into upm directory, for example:
      /usr/local/lib/python2.7/dist-packages/upm
    * Updated UPM example import statements
    * Removed unused RPATH statements from UPM src CMakeLists.txt,
      currently build collateral contains an explicit RPATH which
      is stripped from the install collateral.
    * Converted python examples to work on both python2 AND python3
    * Added ctest for loading examples w/python3
    * Removed returns from swig macros
    * UPM python module use will change...
        Before:
            import pyupm_dfrph
        After:
            from upm import pyupm_dfrph
            or
            import upm.pyupm_dfrph
            etc...
    * This commit fixes #468

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2016-10-10 14:48:42 -07:00
parent 8624a07b77
commit bf425014ab
190 changed files with 1439 additions and 1234 deletions

View File

@ -21,8 +21,9 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import print_function
import time, sys, signal, atexit
import pyupm_collision as upmcollision
from upm import pyupm_collision as upmcollision
def main():
# The was tested with the Collision Sensor
@ -37,7 +38,7 @@ def main():
# This lets you run code on exit,
# including functions from myGrovecollision
def exitHandler():
print "Exiting"
print("Exiting")
sys.exit(0)
# Register exit handlers
@ -45,14 +46,14 @@ def main():
signal.signal(signal.SIGINT, SIGINTHandler)
collisionState = False
print "No collision"
print("No collision")
while(1):
if (mycollision.isColliding() and not collisionState):
print "Collision!"
print("Collision!")
collisionState = True
elif (not mycollision.isColliding() and collisionState):
print "No collision"
print("No collision")
collisionState = False
if __name__ == '__main__':