From ec6bf0fd79199c68f92e1e9a2b05aecf4183ac93 Mon Sep 17 00:00:00 2001 From: Michael James Date: Tue, 9 Oct 2018 09:31:27 -0600 Subject: [PATCH] encode/decode --- awips/dataaccess/PyData.py | 2 +- awips/dataaccess/PyGeometryData.py | 4 ++-- awips/dataaccess/ThriftClientRouter.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awips/dataaccess/PyData.py b/awips/dataaccess/PyData.py index 1a6e1d6..52f0b28 100644 --- a/awips/dataaccess/PyData.py +++ b/awips/dataaccess/PyData.py @@ -33,7 +33,7 @@ class PyData(IData): return self.__time def getLevel(self): - return self.__level + return self.__level.decode('utf-8') def getLocationName(self): return self.__locationName diff --git a/awips/dataaccess/PyGeometryData.py b/awips/dataaccess/PyGeometryData.py index a2c626a..c7bec79 100644 --- a/awips/dataaccess/PyGeometryData.py +++ b/awips/dataaccess/PyGeometryData.py @@ -60,6 +60,6 @@ class PyGeometryData(IGeometryData, PyData.PyData): return unit.decode('utf-8') def getType(self, param): - param = param + param = param.encode('utf-8') type = self.__dataMap[param][1] - return type + return type.decode('utf-8') diff --git a/awips/dataaccess/ThriftClientRouter.py b/awips/dataaccess/ThriftClientRouter.py index 99efaf3..d45f4dc 100644 --- a/awips/dataaccess/ThriftClientRouter.py +++ b/awips/dataaccess/ThriftClientRouter.py @@ -163,7 +163,7 @@ class ThriftClientRouter(object): locNamesRequest = GetAvailableLocationNamesRequest() locNamesRequest.setRequestParameters(request) response = self._client.sendRequest(locNamesRequest) - return response + return [item.decode('utf8') for item in response] def getAvailableParameters(self, request): paramReq = GetAvailableParametersRequest()