From 16f5198ae96a751a26fb9418eaef7c15892701ae Mon Sep 17 00:00:00 2001 From: Michael James Date: Mon, 15 Oct 2018 08:09:09 -0600 Subject: [PATCH] cleanup PyGeometryData getString() --- awips/dataaccess/PyGeometryData.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/awips/dataaccess/PyGeometryData.py b/awips/dataaccess/PyGeometryData.py index 8697830..d83c62c 100644 --- a/awips/dataaccess/PyGeometryData.py +++ b/awips/dataaccess/PyGeometryData.py @@ -42,11 +42,10 @@ class PyGeometryData(IGeometryData, PyData.PyData): def getString(self, param): if six.PY2: - return self.__dataMap[param][0] - value = self.__dataMap[param.encode('utf-8')][0] - if value is not None: - return value.decode('utf-8') - return value + return str(self.__dataMap[param][0]) + else: + value = self.__dataMap[param.encode('utf-8')][0] + return str(value.decode('utf-8')) def getNumber(self, param): t = self.getType(param)