Merge pull request #5811 from TaykYoku/72_JEncode

[v7r2] JEncode bytes

Author: fstagni

src/DIRAC/Core/Utilities/JEncode.py

@@ -4,6 +4,8 @@
 from __future__ import division
 from __future__ import print_function
 
+import six
+from base64 import b64encode, b64decode
 import datetime
 import json
 
@@ -105,7 +107,10 @@ 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 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)
 
@@ -140,6 +145,8 @@ def dict_to_object(dataDict):
             return datetime.datetime.strptime(dataDict["obj"], DATETIME_DEFAULT_FORMAT)
         elif className == "date":
             return datetime.datetime.strptime(dataDict["obj"], DATETIME_DEFAULT_DATE_FORMAT).date()
+        elif className == "b64":
+            return b64decode(dataDict["obj"])
         elif className:
             import importlib
 

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

@@ -21,6 +21,7 @@
 
 from hypothesis import given, settings, HealthCheck
 from hypothesis.strategies import (
+    binary,
     builds,
     integers,
     lists,
@@ -59,7 +60,7 @@
     "jsonTuple",
     "mixTuple",
     "mixTuple (DIRAC_USE_JSON_DECODE=Yes)",
-    "mixTuple (DIRAC_USE_JSON_ENCODE=Yes",
+    "mixTuple (DIRAC_USE_JSON_ENCODE=Yes)",
 )
 
 enc_dec_imp_without_json = (disetTuple, (mixTuple, "No", "No"), (mixTuple, "Yes", "No"))
@@ -167,6 +168,14 @@ def enc_dec_without_json(request, monkeypatch):
     return base_enc_dec(request, monkeypatch)
 
 
+@settings(suppress_health_check=function_scoped)
+@given(data=binary())
+def test_BaseType_Bytes(data):
+    """Test for bytes. Test JEncode with python 3 ONLY, since DEncode distorts the result"""
+    if six.PY3:
+        agnosticTestFunction(jsonTuple, data)
+
+
 @settings(suppress_health_check=function_scoped)
 @given(data=booleans())
 def test_BaseType_Bool(enc_dec, data):