From 486a1ca820aa8c1fbee2de26954524a2c86f4771 Mon Sep 17 00:00:00 2001 From: Michael James Date: Tue, 30 Oct 2018 11:11:42 -0600 Subject: [PATCH] account for python2/3 with six in ThriftSerializationContext pythonToThriftMap --- dynamicserialize/ThriftSerializationContext.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dynamicserialize/ThriftSerializationContext.py b/dynamicserialize/ThriftSerializationContext.py index 5544452..7d8780b 100644 --- a/dynamicserialize/ThriftSerializationContext.py +++ b/dynamicserialize/ThriftSerializationContext.py @@ -255,10 +255,12 @@ class ThriftSerializationContext(object): pyt = type(obj) if pyt in pythonToThriftMap: return pythonToThriftMap[pyt] - elif pyt.__module__[:DS_LEN - 1] == 'dynamicserialize.dstypes': + elif pyt.__module__[:DS_LEN - 1] == ('dynamicserialize.dstypes'): + if six.PY2: + return pythonToThriftMap[types.InstanceType] return pythonToThriftMap[object] raise dynamicserialize.SerializationException( - "Don't know how to serialize object of type: " + str(pyt)) + "Don't know how to serialize object of type: " + str(pyt)) def serializeMessage(self, obj): tt = self._lookupType(obj)