From e980e8a170c372e114e58f19d633c192845cbe44 Mon Sep 17 00:00:00 2001 From: Michael James Date: Tue, 18 Oct 2016 23:24:06 -0500 Subject: [PATCH] python3 fixes for pgen import, ActiveTableRecord indentation, callable SerializationException --- awips/dataaccess/ThriftClientRouter.py | 1 + dynamicserialize/__init__.py | 5 ++--- .../com/raytheon/uf/common/activetable/ActiveTableRecord.py | 6 +++--- .../nws/ncep/common/dataplugin/pgen/response/__init__.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/awips/dataaccess/ThriftClientRouter.py b/awips/dataaccess/ThriftClientRouter.py index da10421..ba95090 100644 --- a/awips/dataaccess/ThriftClientRouter.py +++ b/awips/dataaccess/ThriftClientRouter.py @@ -118,6 +118,7 @@ class ThriftClientRouter(object): # convert the bytearray to a byte string and load it. geometries.append(shapely.wkb.loads(str(byteArrWKB))) + retVal = [] for geoDataRecord in response.getGeoData(): geom = geometries[geoDataRecord.getGeometryWKBindex()] diff --git a/dynamicserialize/__init__.py b/dynamicserialize/__init__.py index ac73ed7..294bdc4 100644 --- a/dynamicserialize/__init__.py +++ b/dynamicserialize/__init__.py @@ -32,8 +32,7 @@ # # -__all__ = [ - ] +__all__ = ['SerializationException'] from . import dstypes, adapters from . import DynamicSerializationManager @@ -55,4 +54,4 @@ def serialize(obj): def deserialize(bytes): dsm = DynamicSerializationManager.DynamicSerializationManager() - return dsm.deserializeBytes(bytes) \ No newline at end of file + return dsm.deserializeBytes(bytes) diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py index afe270b..9a9684d 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py @@ -160,9 +160,9 @@ class ActiveTableRecord(with_metaclass(abc.ABCMeta, object)): return self.issueTime def setIssueTime(self, issueTime): - from datetime import datetime - date = datetime.utcfromtimestamp(issueTime.getTime()/1000) - self.key.setIssueYear(date.year) + from datetime import datetime + date = datetime.utcfromtimestamp(issueTime.getTime()/1000) + self.key.setIssueYear(date.year) self.issueTime = issueTime def getPurgeTime(self): diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/response/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/response/__init__.py index 99b5b4f..529412e 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/response/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/response/__init__.py @@ -6,6 +6,6 @@ __all__ = [ 'RetrieveActivityMapResponse' ] -from ActivityMapData import ActivityMapData -from RetrieveActivityMapResponse import RetrieveActivityMapResponse +from .ActivityMapData import ActivityMapData +from .RetrieveActivityMapResponse import RetrieveActivityMapResponse