diff --git a/awips/RadarCommon.py b/awips/RadarCommon.py index c0f592a..a4fe0b4 100644 --- a/awips/RadarCommon.py +++ b/awips/RadarCommon.py @@ -60,14 +60,14 @@ def get_hdf5_data(idra): threshVals = [] if len(idra) > 0: for ii in range(len(idra)): - if idra[ii].getName() == "Data": + if idra[ii].getName() == b"Data": rdat = idra[ii] - elif idra[ii].getName() == "Angles": + elif idra[ii].getName() == b"Angles": azdat = idra[ii] dattyp = "radial" - elif idra[ii].getName() == "DependentValues": + elif idra[ii].getName() == b"DependentValues": depVals = idra[ii].getShortData() - elif idra[ii].getName() == "Thresholds": + elif idra[ii].getName() == b"Thresholds": threshVals = idra[ii].getShortData() return rdat,azdat,depVals,threshVals diff --git a/dynamicserialize/ThriftSerializationContext.py b/dynamicserialize/ThriftSerializationContext.py index 8b0e508..d7de565 100644 --- a/dynamicserialize/ThriftSerializationContext.py +++ b/dynamicserialize/ThriftSerializationContext.py @@ -154,18 +154,15 @@ class ThriftSerializationContext(object): name = self.protocol.readStructBegin() name = name.replace(b'_', b'.') name = name.decode('cp437') - print(name, name in adapters.classAdapterRegistry) if name.isdigit(): - print("before deserialize", name) obj = self._deserializeType(int(name)) - print("Object", obj, name) return obj elif name in adapters.classAdapterRegistry: return adapters.classAdapterRegistry[name].deserialize(self) elif name.find('$') > -1: # it's an inner class, we're going to hope it's an enum, treat it special fieldName, fieldType, fieldId = self.protocol.readFieldBegin() - if fieldName != '__enumValue__': + if fieldName != b'__enumValue__': raise dynamiceserialize.SerializationException("Expected to find enum payload. Found: " + fieldName) obj = self.protocol.readString() self.protocol.readFieldEnd() @@ -184,7 +181,7 @@ class ThriftSerializationContext(object): if b in self.typeDeserializationMethod: return self.typeDeserializationMethod[b]() else: - raise SerializationException("Unsupported type value " + str(b)) + raise dynamiceserialize.SerializationException("Unsupported type value " + str(b)) def _deserializeField(self, structname, obj):