Merge pull request #6 from denis-sumin/fix-bytes

Fix bytes protobuf type
kaporzhu · Nov 22, 2016 · f7f5df4 · f7f5df4
2 parents 3e42f85 + 8465fcd
commit f7f5df4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/protobuf_to_dict.py b/src/protobuf_to_dict.py
@@ -29,7 +29,7 @@
     FieldDescriptor.TYPE_SFIXED64: int if six.PY3 else six.integer_types[1],
     FieldDescriptor.TYPE_BOOL: bool,
     FieldDescriptor.TYPE_STRING: six.text_type,
-    FieldDescriptor.TYPE_BYTES: lambda b: base64.b64encode(b),
+    FieldDescriptor.TYPE_BYTES: six.binary_type,
     FieldDescriptor.TYPE_ENUM: int,
 }
 
@@ -115,12 +115,7 @@ def _get_field_value_adaptor(pb, field, type_callable_map=TYPE_CALLABLE_MAP, use
         pb.__class__.__name__, field.name, field.type))
 
 
-def get_bytes(value):
-    return base64.b64decode(value)
-
-
 REVERSE_TYPE_CALLABLE_MAP = {
-    FieldDescriptor.TYPE_BYTES: get_bytes,
 }
 
 

diff --git a/src/tests/test_proto_to_dict.py b/src/tests/test_proto_to_dict.py
@@ -177,5 +177,5 @@ def compare(self, m, d, exclude=None):
                 assert field.name in d, field.name
                 assert d[field.name] == getattr(m, field.name), (field.name, d[field.name])
         assert i > 0
-        assert m.byts == base64.b64decode(d['byts'])
+        assert m.byts == d['byts']
         assert d['nested'] == {'req': m.nested.req}