remove python 2 support

Author: jacomago

channelfinder/CFDataTypes.py

@@ -9,13 +9,9 @@
 @author: shroffk
 """
 
-from ._conf import PYTHON3
 
-if PYTHON3:
-    # cmp function is gone in Python 3.
-    # Define for backward compatibility
-    def cmp(a, b):
-        return (a > b) - (a < b)
+def cmp(a, b):
+    return (a > b) - (a < b)
 
 
 class Channel(object):

channelfinder/ChannelFinderClient.py

@@ -15,11 +15,11 @@
 from copy import copy
 
 try:
-    from json import JSONDecoder, JSONEncoder
+    from json import JSONEncoder
 except ImportError:
     from simplejson import JSONEncoder
 
-from ._conf import basecfg, PYTHON3
+from ._conf import basecfg
 
 
 class ChannelFinderClient(object):
@@ -63,10 +63,7 @@ def __getDefaultConfig(self, key, ref):
         """
         result = ref
         if ref is None:
-            if PYTHON3:
-                result = basecfg["DEFAULT"].get(key, None)
-            elif basecfg.has_option("DEFAULT", key):
-                result = basecfg.get("DEFAULT", key)
+            result = basecfg["DEFAULT"].get(key, None)
         return result
 
     def set(self, **kwds):

channelfinder/_conf.py

@@ -12,18 +12,9 @@
 password=MyPassword
 """
 
-import sys
 import os.path
 
-
-if sys.version_info[0] < 3:
-    PYTHON3 = False
-    # Python 2 code in this block
-    from ConfigParser import SafeConfigParser as ConfigParser
-else:
-    PYTHON3 = True
-    # Python 3 code in this block
-    from configparser import ConfigParser
+from configparser import ConfigParser
 
 
 def __loadConfig():

channelfinder/cfPropertyManager/CFPropertyManager.py

@@ -10,7 +10,7 @@
 from getpass import getpass
 
 from channelfinder import ChannelFinderClient
-from channelfinder._conf import basecfg, PYTHON3
+from channelfinder._conf import basecfg
 
 global username, client, exclusion_expression, password, SERVICE_URL, quiet, verbose
 
@@ -122,19 +122,9 @@ def applyExpression():
                     }
                 )
             except Exception as e:
-                if PYTHON3:
-                    # Python 3 code in this block
-                    print(
-                        "Failed to update: "
-                        + channel_name
-                        + " \n--Cause:"
-                        + str(e).strip()
-                    )
-                else:
-                    # Python 2 code in this block
-                    print(
-                        "Failed to update: " + channel_name + " \n--Cause:" + e.message
-                    )
+                print(
+                    "Failed to update: " + channel_name + " \n--Cause:" + str(e).strip()
+                )
 
 
 def updateProperty(result, property_name, channel_name):