fix: remove all additional improvements

Author: TaykYoku

src/DIRAC/ConfigurationSystem/Client/ConfigurationClient.py

@@ -4,7 +4,7 @@
 
 __RCSID__ = "$Id$"
 
-import six
+
 from base64 import b64encode, b64decode
 
 from DIRAC.Core.Tornado.Client.TornadoClient import TornadoClient
@@ -29,7 +29,7 @@ def getCompressedData(self):
         :rtype: str
         """
         retVal = self.executeRPC("getCompressedData")
-        if retVal["OK"] and isinstance(retVal["Value"], six.string_types):
+        if retVal["OK"]:
             retVal["Value"] = b64decode(retVal["Value"])
         return retVal
 
@@ -41,7 +41,7 @@ def getCompressedDataIfNewer(self, sClientVersion):
         :returns: Configuration data, if changed, compressed
         """
         retVal = self.executeRPC("getCompressedDataIfNewer", sClientVersion)
-        if retVal["OK"] and isinstance(retVal["Value"].get("data"), six.string_types):
+        if retVal["OK"] and "data" in retVal["Value"]:
             retVal["Value"]["data"] = b64decode(retVal["Value"]["data"])
         return retVal
 
@@ -51,7 +51,7 @@ def commitNewData(self, sData):
 
         :param sData: Data to commit, you may call this method with CSAPI and Modificator
         """
-        return self.executeRPC("commitNewData", b64encode(sData) if six.PY2 else sData)
+        return self.executeRPC("commitNewData", b64encode(sData))
 
 
 class ConfigurationClient(Client):

src/DIRAC/ConfigurationSystem/Service/TornadoConfigurationHandler.py

@@ -12,7 +12,6 @@
 
 __RCSID__ = "$Id$"
 
-import six
 from base64 import b64encode, b64decode
 
 from DIRAC import S_OK, S_ERROR, gLogger
@@ -49,9 +48,8 @@ def export_getCompressedData(self):
         """
         Returns the configuration
         """
-        # TODO: in 8.0 replace it to:
-        # return S_OK(self.ServiceInterface.getCompressedConfigurationData())
-        return S_OK(b64encode(self.ServiceInterface.getCompressedConfigurationData()).decode())
+        sData = self.ServiceInterface.getCompressedConfigurationData()
+        return S_OK(b64encode(sData))
 
     def export_getCompressedDataIfNewer(self, sClientVersion):
         """
@@ -62,9 +60,7 @@ def export_getCompressedDataIfNewer(self, sClientVersion):
         sVersion = self.ServiceInterface.getVersion()
         retDict = {"newestVersion": sVersion}
         if sClientVersion < sVersion:
-            # TODO: in 8.0 replace it to:
-            # retDict["data"] = self.ServiceInterface.getCompressedConfigurationData()
-            retDict["data"] = b64encode(self.ServiceInterface.getCompressedConfigurationData()).decode()
+            retDict["data"] = b64encode(self.ServiceInterface.getCompressedConfigurationData())
         return S_OK(retDict)
 
     def export_publishSlaveServer(self, sURL):
@@ -83,9 +79,7 @@ def export_commitNewData(self, sData):
         credDict = self.getRemoteCredentials()
         if "DN" not in credDict or "username" not in credDict:
             return S_ERROR("You must be authenticated!")
-        # TODO: in 8.0 remove it
-        if isinstance(sData, six.string_types):
-            sData = b64decode(sData)
+        sData = b64decode(sData)
         return self.ServiceInterface.updateConfiguration(sData, credDict["username"])
 
     def export_writeEnabled(self):

src/DIRAC/Core/Utilities/JEncode.py

@@ -90,21 +90,6 @@ class DJSONEncoder(json.JSONEncoder):
     tuple, datetime, and any object inheriting from JSerializable
     """
 
-    # TODO: remove it in 8.0
-    def encode(self, obj):
-        """This method for backward compatability with python 2 code"""
-        if six.PY2:
-            # Json can't distinguish bytes or str in python 2, so it's trying to encode with utf-8/ascii
-            try:
-                # Let's leave this conversion for backward compatibility, although
-                # it does not guarantee the return of the same data when decoding
-                return super(DJSONEncoder, self).encode(obj)
-            except UnicodeDecodeError as e:
-                # If the encoding type does not match we have an exception
-                # that json does not try to fix using default method
-                obj = self.default(obj)  # Let's use base64 in this case
-        return super(DJSONEncoder, self).encode(obj)
-
     def default(self, obj):  # pylint: disable=method-hidden
         """Add supports for datetime and JSerializable class to default json
 
@@ -122,8 +107,9 @@ def default(self, obj):  # pylint: disable=method-hidden
         # if the object inherits from JSJerializable, try to serialize it
         elif isinstance(obj, JSerializable):
             return obj._toJSON()  # pylint: disable=protected-access
-        # if the object a bytes, decode it
-        elif isinstance(obj, bytes):
+        # if the object a bytes and we're running with Python 3, encode it
+        # Python 2's string type is too ambiguous to handle this correctly.
+        elif six.PY3 and isinstance(obj, bytes):
             return {"__dCls": "b64", "obj": b64encode(obj).decode()}
         # otherwise, let the parent do
         return super(DJSONEncoder, self).default(obj)

src/DIRAC/Core/Utilities/test/Test_Encode.py

@@ -119,8 +119,6 @@ def test_everyBaseTypeIsTested():
     for encodeFunc in g_dEncodeFunctions.values():
         testFuncName = ("test_BaseType_%s" % encodeFunc.__name__).replace("encode", "")
         globals()[testFuncName]
-    # We forgot about binary types
-    globals()["test_BaseType_Bytes"]
 
 
 def agnosticTestFunction(enc_dec_tuple, data):