More fixes for Python 3 compatibility (#13008)

* More fixes for Python 3 compatibility

* Workaround if the six module is not pip installed

* Lose the semicolons

Tools/px4moduledoc/srcparser.py

@@ -2,6 +2,8 @@
 import re
 import math
 import textwrap
+from functools import reduce
+
 
 class ModuleDocumentation(object):
     """

Tools/setup/requirements.txt

@@ -10,6 +10,7 @@ pyserial>=3.0
 pyulog>=0.5.0
 pyyaml
 setuptools>=39.2.0
+six>=1.12.0
 toml>=0.9
 tornado
 wheel>=0.31.1

Tools/uorb_graph/create.py

@@ -10,7 +10,6 @@
 import json
 
 
-
 parser = argparse.ArgumentParser(
     description='Generate uORB pub/sub dependency graph from source code')
 

Tools/upload_log.py

@@ -10,10 +10,10 @@
 from __future__ import print_function
 
 from argparse import ArgumentParser
+from six.moves import input
 import subprocess
 import sys
 
-
 try:
     import requests
 except:
@@ -38,12 +38,7 @@ def ask_value(text, default=None):
     if default != None:
         ask_string += ' (Press ENTER to use ' + default + ')'
     ask_string += ': '
-
-    if sys.version_info[0] < 3:
-        ret = raw_input(ask_string)
-    else:
-        ret = input(ask_string)
-
+    ret = input(ask_string).strip()
     if ret == "" and default != None:
         return default
     return ret

integrationtests/python_src/px4_it/mavros/mavros_offboard_attctl_test.py

@@ -46,6 +46,7 @@
 from mavros_msgs.msg import AttitudeTarget
 from mavros_test_common import MavrosTestCommon
 from pymavlink import mavutil
+from six.moves import xrange
 from std_msgs.msg import Header
 from threading import Thread
 from tf.transformations import quaternion_from_euler

integrationtests/python_src/px4_it/mavros/mavros_offboard_posctl_test.py

@@ -47,6 +47,7 @@
 from geometry_msgs.msg import PoseStamped, Quaternion
 from mavros_test_common import MavrosTestCommon
 from pymavlink import mavutil
+from six.moves import xrange
 from std_msgs.msg import Header
 from threading import Thread
 from tf.transformations import quaternion_from_euler

integrationtests/python_src/px4_it/mavros/mavros_test_common.py

@@ -11,6 +11,7 @@
                             WaypointPush
 from pymavlink import mavutil
 from sensor_msgs.msg import NavSatFix
+from six.moves import xrange
 
 
 class MavrosTestCommon(unittest.TestCase):

integrationtests/python_src/px4_it/mavros/mission_test.py

@@ -53,6 +53,7 @@
 from mavros_msgs.msg import Mavlink, Waypoint, WaypointReached
 from mavros_test_common import MavrosTestCommon
 from pymavlink import mavutil
+from six.moves import xrange
 from threading import Thread
 
 

msg/tools/generate_microRTPS_bridge.py

@@ -53,6 +53,13 @@
 except ImportError:
     raise ImportError(
         "Failed to import yaml. You may need to install it with 'sudo pip install pyyaml'")
+try:
+    from six.moves import input
+except ImportError:
+    try:
+        input = raw_input  # Python 2
+    except NameError:
+        pass  # Python 3
 
 
 def check_rtps_id_uniqueness(classifier):
@@ -281,19 +288,19 @@ def check_rtps_id_uniqueness(classifier):
 
 if del_tree:
     if agent:
-        _continue = str(raw_input("\nFiles in " + agent_out_dir +
-                                  " will be erased, continue?[Y/n]\n"))
-        if _continue == "N" or _continue == "n":
+        _continue = str(input("\nFiles in " + agent_out_dir +
+                              " will be erased, continue?[Y/n]\n"))
+        if _continue.strip() in ("N", "n"):
             print("Aborting execution...")
             exit(-1)
         else:
             if agent and os.path.isdir(agent_out_dir):
                 shutil.rmtree(agent_out_dir)
 
     if client:
-        _continue = str(raw_input(
+        _continue = str(input(
             "\nFiles in " + client_out_dir + " will be erased, continue?[Y/n]\n"))
-        if _continue == "N" or _continue == "n":
+        if _continue.strip() in ("N", "n"):
             print("Aborting execution...")
             exit(-1)
         else:

msg/tools/uorb_rtps_classifier.py

@@ -35,6 +35,7 @@
 import sys
 import os
 import argparse
+import errno
 import yaml
 import re
 import difflib

msg/tools/uorb_to_ros_rtps_ids.py

@@ -3,10 +3,12 @@
 Script to read an yaml file containing the RTPS message IDs and update the naming convention to PascalCase
 """
 
+import errno
 import os
 import yaml
 import sys
 import argparse
+import six
 
 __author__ = 'PX4 Development Team'
 __copyright__ = \
@@ -91,14 +93,8 @@ def update_dict(list):
     if verbose:
         num_of_msgs = 0
     for i, dictionary in enumerate(list["rtps"]):
-        # implementation depends on the Python version being used
-        if sys.version_info[0] < 3:
-            dict = {k: v.title().replace('_', '') if isinstance(
-                v, basestring) else v for k, v in dictionary.iteritems()}
-        else:
-            dict = {k: v.title().replace('_', '') if isinstance(
-                v, str) else v for k, v in dictionary.items()}
-        list["rtps"][i] = dict
+        list["rtps"][i] = {k: v.title().replace('_', '') if isinstance(
+            v, six.string_types) else v for k, v in six.iteritems(dictionary)}
         if verbose:
             num_of_msgs += 1
     if verbose: