Upgrade robot to Python37

Issue-ID: OPTFRA-462
Change-Id: I16358fecf3085c395062b019503a5cbb0aed5416
Signed-off-by: Jerry Flood <jflood@att.com>

2 files changed, 1 insertions, 27 deletions

diff --git a/cmso-robot/robot/locallibrary/cmsoUtils/HTTPUtils.py b/cmso-robot/robot/locallibrary/cmsoUtils/HTTPUtils.py
index f9d380c..8749af8 100644
--- a/cmso-robot/robot/locallibrary/cmsoUtils/HTTPUtils.py
+++ b/cmso-robot/robot/locallibrary/cmsoUtils/HTTPUtils.py
@@ -17,5 +17,5 @@ class HTTPUtils:
     
     def b64_encode(self, instring):
         "" 
-        return base64.b64encode(instring)
+        return base64.b64encode(bytes(instring,encoding='utf8'))
 
diff --git a/cmso-robot/robot/locallibrary/cmsoUtils/JSONUtils.py b/cmso-robot/robot/locallibrary/cmsoUtils/JSONUtils.py
index 5df1e5c..4daccb3 100644
--- a/cmso-robot/robot/locallibrary/cmsoUtils/JSONUtils.py
+++ b/cmso-robot/robot/locallibrary/cmsoUtils/JSONUtils.py
@@ -1,37 +1,11 @@
 import json
 
-from deepdiff import DeepDiff
-
 class JSONUtils:
     """JSONUtils is common resource for simple json helper keywords."""
     
-    def json_equals(self, left, right):
-        """JSON Equals takes in two strings or json objects, converts them into json if needed and then compares them, returning if they are equal or not."""
-        if isinstance(left, basestring):
-            left_json = json.loads(left);
-        else:
-            left_json = left;
-        if isinstance(right, basestring):
-            right_json = json.loads(right);
-        else:
-            right_json = right;
-            
-        ddiff = DeepDiff(left_json, right_json, ignore_order=True);
-        if ddiff == {}:
-            return True;
-        else:
-            return False;
     
     def json_escape(self, jsonObject):
         jsonstr = json.dumps(jsonObject)
         outstr = jsonstr.replace('"', '\\"').replace('\n', '\\n')
         return  outstr    
     
-    def make_list_into_dict(self, listOfDicts, key):
-        """ Converts a list of dicts that contains a field that has a unique key into a dict of dicts """
-        d = {}
-        if isinstance(listOfDicts, list):
-            for thisDict in listOfDicts:
-                v = thisDict[key]
-                d[v] = thisDict
-        return d          
\ No newline at end of file