xan/python-awips
1
0
Fork 0
mirror of https://github.com/Unidata/python-awips.git synced 2025-02-23 22:57:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing more weird python 2/3 string issues

Browse source
This commit is contained in:
freemansw1 2016-04-21 12:08:33 -06:00
parent 26e109effb
commit d38c910e24
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
awips/ThriftClient.py
View file

@ -79,6 +79,7 @@ class ThriftClient:
rval = self.__dsm.deserializeBytes(response.read()) rval = self.__dsm.deserializeBytes(response.read())
self.__httpConn.close() self.__httpConn.close()
# let's verify we have an instance of ServerErrorResponse # let's verify we have an instance of ServerErrorResponse
# IF we do, through an exception up to the caller along # IF we do, through an exception up to the caller along
# with the original Java stack trace # with the original Java stack trace

6
dynamicserialize/ThriftSerializationContext.py
View file

@ -152,8 +152,8 @@ class ThriftSerializationContext(object):
def deserializeMessage(self): def deserializeMessage(self):
name = self.protocol.readStructBegin() name = self.protocol.readStructBegin()
name = name.replace(b'_', b'.')
name = name.decode('cp437') name = name.decode('cp437')
name = name.replace('_', '.')
if name.isdigit(): if name.isdigit():
obj = self._deserializeType(int(name)) obj = self._deserializeType(int(name))
return obj return obj
@ -162,8 +162,8 @@ class ThriftSerializationContext(object):
elif name.find('$') > -1: elif name.find('$') > -1:
# it's an inner class, we're going to hope it's an enum, treat it special # it's an inner class, we're going to hope it's an enum, treat it special
fieldName, fieldType, fieldId = self.protocol.readFieldBegin() fieldName, fieldType, fieldId = self.protocol.readFieldBegin()
if fieldName != b'__enumValue__': if fieldName != '__enumValue__':
raise dynamiceserialize.SerializationException("Expected to find enum payload. Found: " + fieldName) raise dynamiceserialize.SerializationException(b"Expected to find enum payload. Found: " + fieldName)
obj = self.protocol.readString() obj = self.protocol.readString()
self.protocol.readFieldEnd() self.protocol.readFieldEnd()
return obj return obj

4
dynamicserialize/dstypes/com/raytheon/uf/common/serialization/SerializableExceptionWrapper.py
View file

@ -39,8 +39,8 @@ class SerializableExceptionWrapper(object):
def __repr__(self): def __repr__(self):
if not self.message: if not self.message:
self.message = '' self.message = b''
retVal = "" + self.exceptionClass + " exception thrown: " + self.message + "\n" retVal = b"" + self.exceptionClass + b" exception thrown: " + self.message + b"\n"
for element in self.stackTrace: for element in self.stackTrace:
retVal += "\tat " + str(element) + "\n" retVal += "\tat " + str(element) + "\n"

6
dynamicserialize/dstypes/java/lang/StackTraceElement.py
View file

@ -59,13 +59,13 @@ class StackTraceElement(object):
return self.__repr__() return self.__repr__()
def __repr__(self): def __repr__(self):
msg = self.declaringClass + "." + self.methodName msg = self.declaringClass.decode('cp437') + "." + self.methodName.decode('cp437')
if self.isNativeMethod(): if self.isNativeMethod():
msg += "(Native Method)" msg += "(Native Method)"
elif self.fileName is not None and self.lineNumber >= 0: elif self.fileName is not None and self.lineNumber >= 0:
msg += "(" + self.fileName + ":" + str(self.lineNumber) + ")" msg += "(" + self.fileName.decode('cp437') + ":" + str(self.lineNumber) + ")"
elif self.fileName is not None: elif self.fileName is not None:
msg += "(" + self.fileName + ")" msg += "(" + self.fileName.decode('cp437') + ")"
else: else:
msg += "(Unknown Source)" msg += "(Unknown Source)"
return msg return msg