Remove the six module and Python 2 compatibility code

Author: cclauss

MAVProxy/modules/lib/wxsettings_ui.py

@@ -71,12 +71,7 @@ def on_load(self, event):
             setting = self.setting_map[label]
             ctrl = self.controls[label]
             value = ctrl.GetValue()
-
-            # Python 2 compatiblility - alternative is:
-            # import six
-            # isinstance(value, six.string_types)
-            if isinstance(value, str) \
-                or isinstance(value, str if sys.version_info[0] >= 3 else unicode):
+            if isinstance(value, str):
                 ctrl.SetValue(str(setting.value))
             else:
                 ctrl.SetValue(setting.value)

MAVProxy/modules/mavproxy_SIYI/__init__.py

@@ -116,13 +116,8 @@ def crc16_from_bytes(bytes, initial=0):
     # Check string: '123456789'
     # Check value: 0x29B1
 
-    try:
-        if isinstance(bytes, basestring):  # Python 2.7 compatibility
-            bytes = map(ord, bytes)
-    except NameError:
-        if isinstance(bytes, str):  # This branch will be taken on Python 3
-            bytes = map(ord, bytes)
-
+    if isinstance(bytes, str):
+        bytes = map(ord, bytes)
     crc = initial
     for byte in bytes:
         crc ^= byte << 8

MAVProxy/modules/mavproxy_map/mp_tile.py

@@ -216,13 +216,7 @@ def __init__(self, cache_path=None, download=True, cache_size=500,
         self._download_thread = None
         self._loading = mp_icon('loading.jpg')
         self._unavailable = mp_icon('unavailable.jpg')
-        try:
-            self._tile_cache = collections.OrderedDict()
-        except AttributeError:
-            # OrderedDicts in python 2.6 come from the ordereddict module
-            # which is a 3rd party package, not in python2.6 distribution
-            import ordereddict
-            self._tile_cache = ordereddict.OrderedDict()
+        self._tile_cache = collections.OrderedDict()
 
     def set_service(self, service):
         '''set tile service'''

MAVProxy/modules/mavproxy_smartcamera/__init__.py

@@ -12,7 +12,7 @@
 #                it what cameras are connected, it then tries to connect to the
 #                cameras and populates a list of available cameras.
 #
-# Environment  : Python 2.7 Code. Intended to be included in MAVproxy as a Module
+# Environment  : Intended to be included in MAVproxy as a Module
 #
 # Responsible  : Jaime Machuca
 #

MAVProxy/modules/mavproxy_smartcamera/sc_ExifWriter.py

@@ -13,7 +13,7 @@
 #
 #                https://github.com/Escadrone/Solo-Mapper.git
 #
-# Environment  : Python 2.7 Code. Intended to be included in MAVproxy as a Module
+# Environment  : Intended to be included in MAVproxy as a Module
 #
 # Responsible  : Jaime Machuca
 #

MAVProxy/modules/mavproxy_smartcamera/sc_SonyQX1.py

@@ -10,7 +10,7 @@
 #                have support for triggering the camera, and downloading the
 #                latest image file. Other functions will be added gradually.
 #
-# Environment  : Python 2.7 Code. Intended to be included in a Mavproxy Module
+# Environment  : Intended to be included in a Mavproxy Module
 #
 # Responsible  : Jaime Machuca
 #

windows/mavproxy.spec

@@ -12,7 +12,7 @@ MAVProxyAny = Analysis(['mavproxy.py'],
                             'wx.lib.agw.genericmessagedialog', 'wx.lib.wordwrap', 'wx.lib.buttons',
                             'wx.lib.embeddedimage', 'wx.lib.imageutils', 'wx.lib.agw.aquabutton', 
                             'wx.lib.agw.gradientbutton',
-                            'six','packaging', 'packaging.version', 'packaging.specifiers',
+                            'packaging', 'packaging.version', 'packaging.specifiers',
                             'requests',
                             ] + collect_submodules('MAVProxy.modules') + 
                             collect_submodules('pymavlink') + collect_submodules('yaml') + collect_submodules('pygame'),