ArduPilot · peterbarker · Feb 25, 2025 · Feb 25, 2025 · Feb 25, 2025 · Feb 25, 2025
diff --git a/Tools/Replay/check_replay.py b/Tools/Replay/check_replay.py
@@ -4,8 +4,6 @@
 check that replay produced identical results
 '''
 
-from __future__ import print_function
-
 def check_log(logfile, progress=print, ekf2_only=False, ekf3_only=False, verbose=False, accuracy=0.0, ignores=set()):
     '''check replay log for matching output'''
     from pymavlink import mavutil

diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-from __future__ import print_function
 from waflib import Build, ConfigSet, Configure, Context, Errors, Logs, Options, Utils, Task
 from waflib.Configure import conf
 from waflib.Scripting import run_command

diff --git a/Tools/autotest/antennatracker.py b/Tools/autotest/antennatracker.py
@@ -5,8 +5,6 @@
 
 '''
 
-from __future__ import print_function
-
 import math
 import operator
 import os

diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
@@ -4,7 +4,6 @@
 AP_FLAKE8_CLEAN
 '''
 
-from __future__ import print_function
 import copy
 import math
 import os

diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py
@@ -4,7 +4,6 @@
 AP_FLAKE8_CLEAN
 '''
 
-from __future__ import print_function
 import copy
 import math
 import os

diff --git a/Tools/autotest/ardusub.py b/Tools/autotest/ardusub.py
@@ -7,7 +7,6 @@
 AP_FLAKE8_CLEAN
 '''
 
-from __future__ import print_function
 import os
 import sys
 

diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py
@@ -6,7 +6,6 @@
 
  AP_FLAKE8_CLEAN
 """
-from __future__ import print_function
 import atexit
 import fnmatch
 import copy

diff --git a/Tools/autotest/balancebot.py b/Tools/autotest/balancebot.py
@@ -5,8 +5,6 @@
 
 '''
 
-from __future__ import print_function
-
 import os
 
 from rover import AutoTestRover

diff --git a/Tools/autotest/blimp.py b/Tools/autotest/blimp.py
@@ -4,7 +4,6 @@
 AP_FLAKE8_CLEAN
 '''
 
-from __future__ import print_function
 import os
 import shutil
 

diff --git a/Tools/autotest/examples.py b/Tools/autotest/examples.py
@@ -4,9 +4,6 @@
 AP_FLAKE8_CLEAN
 """
 
-from __future__ import print_function
-
-
 import os
 import pexpect
 import signal

diff --git a/Tools/autotest/fakepos.py b/Tools/autotest/fakepos.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import print_function
+
 import errno
 import socket
 import struct

diff --git a/Tools/autotest/helicopter.py b/Tools/autotest/helicopter.py
@@ -4,8 +4,6 @@
 AP_FLAKE8_CLEAN
 '''
 
-from __future__ import print_function
-
 from arducopter import AutoTestCopter
 
 import vehicle_test_suite

diff --git a/Tools/autotest/logger_metadata/emit_html.py b/Tools/autotest/logger_metadata/emit_html.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import emitter
 
 class HTMLEmitter(emitter.Emitter):

diff --git a/Tools/autotest/logger_metadata/emit_rst.py b/Tools/autotest/logger_metadata/emit_rst.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import emitter
 
 class RSTEmitter(emitter.Emitter):

diff --git a/Tools/autotest/logger_metadata/emit_xml.py b/Tools/autotest/logger_metadata/emit_xml.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 from lxml import etree
 import emitter
 

diff --git a/Tools/autotest/logger_metadata/enum_parse.py b/Tools/autotest/logger_metadata/enum_parse.py
@@ -4,8 +4,6 @@
 AP_FLAKE8_CLEAN
 '''
 
-from __future__ import print_function
-
 import argparse
 import os
 import re

diff --git a/Tools/autotest/logger_metadata/parse.py b/Tools/autotest/logger_metadata/parse.py
@@ -4,8 +4,6 @@
 AP_FLAKE8_CLEAN
 '''
 
-from __future__ import print_function
-
 import argparse
 import copy
 import os

diff --git a/Tools/autotest/param_metadata/param_parse.py b/Tools/autotest/param_metadata/param_parse.py
@@ -7,7 +7,6 @@
 
 '''
 
-from __future__ import print_function
 import copy
 import os
 import re

diff --git a/Tools/autotest/param_metadata/rstemit.py b/Tools/autotest/param_metadata/rstemit.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import print_function
+
 import re
 from param import known_param_fields, known_units
 from emit import Emit

diff --git a/Tools/autotest/pysim/fdpexpect.py b/Tools/autotest/pysim/fdpexpect.py
@@ -3,7 +3,7 @@
 
 $Id: fdpexpect.py 505 2007-12-26 21:33:50Z noah $
 """
-from __future__ import print_function
+
 import os
 
 from pexpect import ExceptionPexpect, spawn

diff --git a/Tools/autotest/pysim/util.py b/Tools/autotest/pysim/util.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 '''
 AP_FLAKE8_CLEAN
 '''

diff --git a/Tools/autotest/quadplane.py b/Tools/autotest/quadplane.py
@@ -5,7 +5,6 @@
 
 '''
 
-from __future__ import print_function
 import os
 import numpy
 import math

diff --git a/Tools/autotest/rover.py b/Tools/autotest/rover.py
@@ -5,8 +5,6 @@
 
 '''
 
-from __future__ import print_function
-
 import copy
 import math
 import operator

diff --git a/Tools/autotest/sailboat.py b/Tools/autotest/sailboat.py
@@ -5,8 +5,6 @@
 
 '''
 
-from __future__ import print_function
-
 import os
 
 from rover import AutoTestRover

diff --git a/Tools/autotest/sim_vehicle.py b/Tools/autotest/sim_vehicle.py
@@ -9,7 +9,6 @@
 AP_FLAKE8_CLEAN
 
 """
-from __future__ import print_function
 
 import atexit
 import datetime

diff --git a/Tools/autotest/test_build_options.py b/Tools/autotest/test_build_options.py
@@ -18,8 +18,6 @@
 AP_FLAKE8_CLEAN
 """
 
-from __future__ import print_function
-
 import fnmatch
 import optparse
 import os

diff --git a/Tools/autotest/vehicle_test_suite.py b/Tools/autotest/vehicle_test_suite.py
@@ -4,7 +4,6 @@
 AP_FLAKE8_CLEAN
 
 '''
-from __future__ import print_function
 
 import abc
 import copy

diff --git a/Tools/mavproxy_modules/sitl_calibration.py b/Tools/mavproxy_modules/sitl_calibration.py
@@ -14,7 +14,6 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 '''calibration simulation command handling'''
 
-from __future__ import division, print_function
 import math
 from pymavlink import quaternion
 import random

diff --git a/Tools/scripts/build_binaries.py b/Tools/scripts/build_binaries.py
@@ -8,8 +8,6 @@
 AP_FLAKE8_CLEAN
 """
 
-from __future__ import print_function
-
 import datetime
 import optparse
 import os

diff --git a/Tools/scripts/build_binaries_history.py b/Tools/scripts/build_binaries_history.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import os
 import sqlite3
 

diff --git a/Tools/scripts/du32_change.py b/Tools/scripts/du32_change.py
@@ -7,8 +7,6 @@
 
 """
 
-from __future__ import print_function
-
 import optparse
 import sys
 import time

diff --git a/Tools/scripts/generate_manifest.py b/Tools/scripts/generate_manifest.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
-
 import copy
 import fnmatch
 import gen_stable

diff --git a/Tools/scripts/powr_change.py b/Tools/scripts/powr_change.py
@@ -7,8 +7,6 @@
 
 """
 
-from __future__ import print_function
-
 import optparse
 import sys
 import time

diff --git a/Tools/scripts/sensor_status_change.py b/Tools/scripts/sensor_status_change.py
@@ -7,8 +7,6 @@
 
 """
 
-from __future__ import print_function
-
 import optparse
 import sys
 import time

diff --git a/Tools/scripts/solution_status_change.py b/Tools/scripts/solution_status_change.py
@@ -7,8 +7,6 @@
 
 """
 
-from __future__ import print_function
-
 import optparse
 import sys
 import time

diff --git a/Tools/scripts/uploader.py b/Tools/scripts/uploader.py
@@ -52,9 +52,6 @@
 
 # AP_FLAKE8_CLEAN
 
-# for python2.7 compatibility
-from __future__ import print_function
-
 import sys
 import argparse
 import binascii

diff --git a/libraries/AP_HAL/examples/DSP_test/gyro_isb_reader.py b/libraries/AP_HAL/examples/DSP_test/gyro_isb_reader.py
@@ -3,8 +3,6 @@
 '''
 extract ISBH and ISBD messages from AP_Logging files and produce C++ arrays for consumption by the DSP subsystem
 '''
-from __future__ import print_function
-
 import os
 import sys
 import time

diff --git a/libraries/AP_Math/tools/geodesic_grid/geodesic_grid.py b/libraries/AP_Math/tools/geodesic_grid/geodesic_grid.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+
 import argparse
 import numpy as np
 import sys

diff --git a/waf b/waf
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import subprocess
 import os.path as p
 import sys

diff --git a/wscript b/wscript
@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 # encoding: utf-8
 
-from __future__ import print_function
-
 import os.path
 import os
 import sys
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ @@
     '''
-    from __future__ import print_function
     import os
     from rover import AutoTestRover
@@ Expand Down @@