got bytearrays working, hopefully

pgbovine · pgbovine · commit 03f566a69d4d · 2015-02-22T14:34:51.000-05:00
diff --git a/v3/pg_encoder.py b/v3/pg_encoder.py
@@ -318,7 +318,14 @@ def encode(self, dat, get_parent):
           m = classRE.match(typeStr)
 
         assert m, typ
-        new_obj.extend([m.group(1), str(dat)])
+
+        if is_python3:
+          encoded_dat = str(dat)
+        else:
+          # ugh, for bytearray() in Python 2, str() returns
+          # non-JSON-serializable characters, so need to decode:
+          encoded_dat = str(dat).decode('utf-8', 'replace')
+        new_obj.extend([m.group(1), encoded_dat])
 
       return ret
 
diff --git a/v3/tests/backend-tests/bytearray.golden b/v3/tests/backend-tests/bytearray.golden
@@ -0,0 +1,71 @@
+{
+  "code": "# reported as an error in server logs\nhex_string = \"deadbeef\"\nhex_data = hex_string.decode(\"hex\")\nnew = bytearray(hex_data)\n", 
+  "trace": [
+    {
+      "ordered_globals": [], 
+      "stdout": "", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {}, 
+      "heap": {}, 
+      "line": 2, 
+      "event": "step_line"
+    }, 
+    {
+      "ordered_globals": [
+        "hex_string"
+      ], 
+      "stdout": "", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {
+        "hex_string": "deadbeef"
+      }, 
+      "heap": {}, 
+      "line": 3, 
+      "event": "step_line"
+    }, 
+    {
+      "ordered_globals": [
+        "hex_string", 
+        "hex_data"
+      ], 
+      "stdout": "", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {
+        "hex_data": "\u07ad\ufffd\ufffd", 
+        "hex_string": "deadbeef"
+      }, 
+      "heap": {}, 
+      "line": 4, 
+      "event": "step_line"
+    }, 
+    {
+      "ordered_globals": [
+        "hex_string", 
+        "hex_data", 
+        "new"
+      ], 
+      "stdout": "", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {
+        "new": [
+          "REF", 
+          1
+        ], 
+        "hex_data": "\u07ad\ufffd\ufffd", 
+        "hex_string": "deadbeef"
+      }, 
+      "heap": {
+        "1": [
+          "bytearray", 
+          "\u07ad\ufffd\ufffd"
+        ]
+      }, 
+      "line": 4, 
+      "event": "return"
+    }
+  ]
+}
diff --git a/v3/tests/backend-tests/bytearray.golden_py3 b/v3/tests/backend-tests/bytearray.golden_py3
@@ -0,0 +1,44 @@
+{
+  "code": "# reported as an error in server logs\nhex_string = \"deadbeef\"\nhex_data = hex_string.decode(\"hex\")\nnew = bytearray(hex_data)\n", 
+  "trace": [
+    {
+      "ordered_globals": [], 
+      "stdout": "", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {}, 
+      "heap": {}, 
+      "line": 2, 
+      "event": "step_line"
+    }, 
+    {
+      "ordered_globals": [
+        "hex_string"
+      ], 
+      "stdout": "", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {
+        "hex_string": "deadbeef"
+      }, 
+      "heap": {}, 
+      "line": 3, 
+      "event": "step_line"
+    }, 
+    {
+      "ordered_globals": [
+        "hex_string"
+      ], 
+      "stdout": "", 
+      "exception_msg": "AttributeError: 'str' object has no attribute 'decode'", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {
+        "hex_string": "deadbeef"
+      }, 
+      "heap": {}, 
+      "line": 3, 
+      "event": "exception"
+    }
+  ]
+}
diff --git a/v3/tests/backend-tests/bytearray.txt b/v3/tests/backend-tests/bytearray.txt
@@ -0,0 +1,4 @@
+# reported as an error in server logs
+hex_string = "deadbeef"
+hex_data = hex_string.decode("hex")
+new = bytearray(hex_data)
