From 21436dc1a6b27ff45967e60499a08bbfa11c8100 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 18 Jun 2013 16:27:21 +1000 Subject: [PATCH] autotest: fixed import of mavwp --- Tools/autotest/apmrover2.py | 3 ++- Tools/autotest/arducopter.py | 3 ++- Tools/autotest/arduplane.py | 3 ++- Tools/autotest/common.py | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Tools/autotest/apmrover2.py b/Tools/autotest/apmrover2.py index 606a2d5dbd..11c80ce5df 100644 --- a/Tools/autotest/apmrover2.py +++ b/Tools/autotest/apmrover2.py @@ -2,7 +2,8 @@ import util, pexpect, sys, time, math, shutil, os from common import * -import mavutil, random +from pymavlink import mavutil +import random # get location of scripts testdir=os.path.dirname(os.path.realpath(__file__)) diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py index 6bb247f08b..3c747ec341 100644 --- a/Tools/autotest/arducopter.py +++ b/Tools/autotest/arducopter.py @@ -2,7 +2,8 @@ import util, pexpect, sys, time, math, shutil, os from common import * -import mavutil, mavwp, random +from pymavlink import mavutil, mavwp +import random # get location of scripts testdir=os.path.dirname(os.path.realpath(__file__)) diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py index 929d2b5694..5b199ead6c 100644 --- a/Tools/autotest/arduplane.py +++ b/Tools/autotest/arduplane.py @@ -2,7 +2,8 @@ import util, pexpect, sys, time, math, shutil, os from common import * -import mavutil, random +from pymavlink import mavutil +import random # get location of scripts testdir=os.path.dirname(os.path.realpath(__file__)) diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index c3bfa3c8d3..c333654e5b 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -1,4 +1,5 @@ -import util, pexpect, time, math, mavwp +import util, pexpect, time, math +from pymavlink import mavwp # a list of pexpect objects to read while waiting for # messages. This keeps the output to stdout flowing