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

@ -22,8 +22,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 sys
import pyupm_grovescam as upmGrovescam
from upm import pyupm_grovescam as upmGrovescam
def main():
# Instantiate a Grove Serial Camera on UART 0
@ -31,34 +32,34 @@ def main():
# make sure port is initialized properly. 115200 baud is the default.
if (not camera.setupTty()):
print "Failed to setup tty port parameters"
print("Failed to setup tty port parameters")
sys.exit(1)
if (camera.init()):
print "Initialized..."
print("Initialized...")
else:
print "init() failed"
print("init() failed")
if (camera.preCapture()):
print "preCapture succeeded..."
print("preCapture succeeded...")
else:
print "preCapture failed."
print("preCapture failed.")
if (camera.doCapture()):
print "doCapture succeeded..."
print("doCapture succeeded...")
else:
print "doCapture failed."
print("doCapture failed.")
print "Image size is", camera.getImageSize(), "bytes"
print("Image size is", camera.getImageSize(), "bytes")
if (camera.getImageSize() > 0):
print "Storing image.jpg..."
print("Storing image.jpg...")
if (camera.storeImage("image.jpg")):
print "storeImage succeeded..."
print("storeImage succeeded...")
else:
print "storeImage failed."
print("storeImage failed.")
print "Exiting."
print("Exiting.")
sys.exit(0)
if __name__ == '__main__':