python3 fixes for pgen import, ActiveTableRecord indentation, callable SerializationException

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()]

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)
+    return dsm.deserializeBytes(bytes)

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
+        from datetime import datetime
-	date = datetime.utcfromtimestamp(issueTime.getTime()/1000)
+        date = datetime.utcfromtimestamp(issueTime.getTime()/1000)
-	self.key.setIssueYear(date.year)
+        self.key.setIssueYear(date.year)
         self.issueTime = issueTime
 
     def getPurgeTime(self):

dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/response/__init__.py

@@ -6,6 +6,6 @@ __all__ = [
             'RetrieveActivityMapResponse'
           ]
 
-from ActivityMapData import ActivityMapData
+from .ActivityMapData import ActivityMapData
-from RetrieveActivityMapResponse import RetrieveActivityMapResponse
+from .RetrieveActivityMapResponse import RetrieveActivityMapResponse