refactor (CS): use JEncode bytes for CS

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
@@ -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))
+        return self.executeRPC("commitNewData", b64encode(sData) if six.PY2 else sData)
 
 
 class ConfigurationClient(Client):

src/DIRAC/ConfigurationSystem/Service/TornadoConfigurationHandler.py

@@ -49,8 +49,9 @@ def export_getCompressedData(self):
         """
         Returns the configuration
         """
-        sData = self.ServiceInterface.getCompressedConfigurationData()
-        return S_OK(b64encode(sData))
+        # TODO: in 8.0 replace it to:
+        # return S_OK(self.ServiceInterface.getCompressedConfigurationData())
+        return S_OK(b64encode(self.ServiceInterface.getCompressedConfigurationData()).decode())
 
     def export_getCompressedDataIfNewer(self, sClientVersion):
         """
@@ -61,7 +62,9 @@ def export_getCompressedDataIfNewer(self, sClientVersion):
         sVersion = self.ServiceInterface.getVersion()
         retDict = {"newestVersion": sVersion}
         if sClientVersion < sVersion:
-            retDict["data"] = b64encode(self.ServiceInterface.getCompressedConfigurationData())
+            # TODO: in 8.0 replace it to:
+            # retDict["data"] = self.ServiceInterface.getCompressedConfigurationData()
+            retDict["data"] = b64encode(self.ServiceInterface.getCompressedConfigurationData()).decode()
         return S_OK(retDict)
 
     def export_publishSlaveServer(self, sURL):