autotest: fixed import paths for pymavlink

assumes installed package now

Tools/autotest/autotest.py

@@ -7,9 +7,6 @@ import optparse, fnmatch, time, glob, traceback, signal
 
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), 'pysim'))
 
-# cope with the mavlink package not being installed, and just being a git tree
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', '..', 'mavlink'))
-
 import util
 
 os.environ['PYTHONUNBUFFERED'] = '1'
@@ -335,8 +332,7 @@ class TestResults(object):
 
 def write_webresults(results):
     '''write webpage results'''
-    sys.path.insert(0, os.path.join(util.reltopdir("../mavlink/pymavlink/generator")))
+    from pymavlink.generator import mavtemplate
-    import mavtemplate
     t = mavtemplate.MAVTemplate()
     for h in glob.glob(util.reltopdir('Tools/autotest/web/*.html')):
         html = util.loadfile(h)

Tools/autotest/autotest_jenkins.py

@@ -6,13 +6,12 @@ import pexpect, os, sys, shutil, atexit
 
 
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), 'pysim'))
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', '..', 'mavlink', 'pymavlink'))
 
-import optparse, fnmatch, time, glob, traceback, signal, util, time, math, common
+import optparse, fnmatch, time, glob, traceback, signal, util, time, math, common, random
 from common import *
 
 
-import mavutil, mavwp, random
+from pymavlink import mavutil, mavwp
 import arduplane, arducopter
 
 # Defaults
@@ -263,8 +262,7 @@ class TestResults(object):
 
 def write_XMLresults(atype, results):
     '''write XML JUnit results'''
-    sys.path.insert(0, os.path.join(util.reltopdir("../mavlink/pymavlink/generator")))
+    from pymavlink.generator import mavtemplate
-    import mavtemplate
     t = mavtemplate.MAVTemplate()
     for x in glob.glob(util.reltopdir('Tools/autotest/junit.xml')):
         junit_xml = util.loadfile(x)
@@ -274,8 +272,7 @@ def write_XMLresults(atype, results):
 
 def write_webresults(results):
     '''write webpage results'''
-    sys.path.insert(0, os.path.join(util.reltopdir("../mavlink/pymavlink/generator")))
+    from pymavlink.generator import mavtemplate
-    import mavtemplate
     t = mavtemplate.MAVTemplate()
     for h in glob.glob(util.reltopdir('Tools/autotest/web/*.html')):
         html = util.loadfile(h)

Tools/autotest/dump_logs.py

@@ -6,8 +6,6 @@ import pexpect, os, sys, shutil, atexit
 import optparse, fnmatch, time, glob, traceback, signal
 
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), 'pysim'))
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', '..', 'mavlink', 'pymavlink'))
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', '..', 'mavlink', 'pymavlink', 'generator'))
 import util
 
 ############## main program #############

Tools/autotest/jsbsim/runsim.py

@@ -5,9 +5,9 @@ import sys, os, pexpect, socket
 import math, time, select, struct, signal, errno
 
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'pysim'))
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', '..', '..', 'mavlink', 'pymavlink'))
 
-import util, fgFDM, atexit, fdpexpect
+import util, atexit, fdpexpect
+from pymavlink import fgFDM
 
 class control_state(object):
     def __init__(self):

Tools/autotest/pysim/fg_display.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import socket, struct, time, math, errno
-import fgFDM
+from pymavlink import fgFDM
 
 class udp_socket(object):
     '''a UDP socket'''

Tools/autotest/pysim/sim_multicopter.py

@@ -5,8 +5,7 @@ import util, time, os, sys, math
 import socket, struct
 import select, errno
 
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', '..', '..', 'mavlink', 'pymavlink'))
+from pymavlink import fgFDM
-import fgFDM
 
 def sim_send(m, a):
     '''send flight information to mavproxy and flightgear'''

Tools/autotest/pysim/sim_rover.py

@@ -8,8 +8,6 @@ import util, time, os, sys, math
 import socket, struct
 import select, errno
 
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', '..', '..', 'mavlink', 'pymavlink'))
-
 def sim_send(a):
     '''send flight information to mavproxy'''
     from math import degrees

Tools/run_sim_mission.py

@@ -7,11 +7,7 @@ import pexpect
 
 MODULE_DIR = os.path.dirname(os.path.realpath(__file__))
 
-# This is terrible.
+from pymavlink import mavutil, mavwp
-sys.path.insert(0,
-                os.path.join(MODULE_DIR, '..', '..', 'mavlink', 'pymavlink'))
-import mavutil
-import mavwp
 
 # So is this.
 sys.path.insert(0, os.path.join(MODULE_DIR, 'autotest'))