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

Revert "fix getAttribute(s) encoding/decoding, move to PyData"

Browse source 
This reverts commit e133129843.
This commit is contained in:
Michael James 2018-10-15 15:19:52 -06:00
parent 675894876c
commit 3c580ed1fc
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
awips/dataaccess/PyData.py
View file

@ -25,10 +25,7 @@ class PyData(IData):
self.__attributes = dataRecord.getAttributes() self.__attributes = dataRecord.getAttributes()
def getAttribute(self, key): def getAttribute(self, key):
if six.PY2:
return self.__attributes[key] return self.__attributes[key]
value = self.__attributes[key.encode('utf-8')]
return value.decode('utf-8')
def getAttributes(self): def getAttributes(self):
return self.__attributes.keys() return self.__attributes.keys()

3
dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/response/AbstractResponseData.py
View file

@ -33,7 +33,10 @@ class AbstractResponseData(six.with_metaclass(abc.ABCMeta, object)):
self.locationName = locationName self.locationName = locationName
def getAttributes(self): def getAttributes(self):
if six.PY2:
return self.attributes return self.attributes
else:
return [item.decode('utf-8') for item in self.attributes]
def setAttributes(self, attributes): def setAttributes(self, attributes):
self.attributes = attributes self.attributes = attributes