diff --git a/.gitignore b/.gitignore index 3d978be..b496937 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .ipynb_checkpoints docs/build/ + +*.pyc diff --git a/dynamicserialize/ThriftSerializationContext.py b/dynamicserialize/ThriftSerializationContext.py index ee8ebfa..c9ffaea 100644 --- a/dynamicserialize/ThriftSerializationContext.py +++ b/dynamicserialize/ThriftSerializationContext.py @@ -44,12 +44,11 @@ from thrift.Thrift import TType import inspect, sys, types import dynamicserialize from dynamicserialize import dstypes, adapters -from . import SelfDescribingBinaryProtocol +from dynamicserialize import SelfDescribingBinaryProtocol import numpy import collections dsObjTypes = {} - def buildObjMap(module): if '__all__' in module.__dict__: for i in module.__all__: @@ -75,7 +74,7 @@ pythonToThriftMap = { float: SelfDescribingBinaryProtocol.FLOAT, #types.FloatType: TType.DOUBLE, bool: TType.BOOL, - types.InstanceType: TType.STRUCT, + object: TType.STRUCT, type(None): TType.VOID, numpy.float32: SelfDescribingBinaryProtocol.FLOAT, numpy.int32: TType.I32, @@ -180,7 +179,7 @@ class ThriftSerializationContext(object): if b in self.typeDeserializationMethod: return self.typeDeserializationMethod[b]() else: - raise dynamicserialize.SerializationException("Unsupported type value " + str(b)) + raise SerializationException("Unsupported type value " + str(b)) def _deserializeField(self, structname, obj): @@ -200,9 +199,9 @@ class ThriftSerializationContext(object): if isinstance(setMethod, collections.Callable): setMethod(result) else: - raise dynamicserialize.SerializationException("Couldn't find setter method " + lookingFor) + raise SerializationException("Couldn't find setter method " + lookingFor) except: - raise dynamicserialize.SerializationException("Couldn't find setter method " + lookingFor) + raise SerializationException("Couldn't find setter method " + lookingFor) self.protocol.readFieldEnd() return True diff --git a/dynamicserialize/adapters/__init__.py b/dynamicserialize/adapters/__init__.py index 24db1bc..aa0e0f1 100644 --- a/dynamicserialize/adapters/__init__.py +++ b/dynamicserialize/adapters/__init__.py @@ -66,7 +66,7 @@ classAdapterRegistry = {} def getAdapterRegistry(): import sys for x in __all__: - exec('import ' + x) + exec('import dynamicserialize.adapters.' + x ) m = sys.modules['dynamicserialize.adapters.' + x] d = m.__dict__ if 'ClassAdapter' in d: diff --git a/dynamicserialize/dstypes/__init__.py b/dynamicserialize/dstypes/__init__.py index 6a8f2da..2757246 100644 --- a/dynamicserialize/dstypes/__init__.py +++ b/dynamicserialize/dstypes/__init__.py @@ -26,4 +26,3 @@ __all__ = [ 'java' ] - diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py index 1c7dbbc..1c191e3 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py @@ -28,7 +28,7 @@ from . import ActiveTableRecord -class OperationalActiveTableRecord(ActiveTableRecord.ActiveTableRecord): +class OperationalActiveTableRecord(ActiveTableRecord): def __init__(self): super(OperationalActiveTableRecord, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py index a9174f1..ca49cba 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py @@ -28,7 +28,7 @@ from . import ActiveTableRecord -class PracticeActiveTableRecord(ActiveTableRecord.ActiveTableRecord): +class PracticeActiveTableRecord(ActiveTableRecord): def __init__(self): super(PracticeActiveTableRecord, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridHistoryUpdateNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridHistoryUpdateNotification.py index cf8c116..2bf448c 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridHistoryUpdateNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridHistoryUpdateNotification.py @@ -28,7 +28,7 @@ from . import GfeNotification -class GridHistoryUpdateNotification(GfeNotification.GfeNotification): +class GridHistoryUpdateNotification(GfeNotification): def __init__(self): super(GridHistoryUpdateNotification, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridUpdateNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridUpdateNotification.py index 9be3e40..b0dcef6 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridUpdateNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridUpdateNotification.py @@ -29,7 +29,7 @@ from . import GfeNotification -class GridUpdateNotification(GfeNotification.GfeNotification): +class GridUpdateNotification(GfeNotification): def __init__(self): super(GridUpdateNotification, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/LockNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/LockNotification.py index 454225b..abed54e 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/LockNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/LockNotification.py @@ -29,7 +29,7 @@ from . import GfeNotification -class LockNotification(GfeNotification.GfeNotification): +class LockNotification(GfeNotification): def __init__(self): super(LockNotification, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/ServiceBackupJobStatusNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/ServiceBackupJobStatusNotification.py index 20d15b3..78b1283 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/ServiceBackupJobStatusNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/ServiceBackupJobStatusNotification.py @@ -28,7 +28,7 @@ from . import GfeNotification -class ServiceBackupJobStatusNotification(GfeNotification.GfeNotification): +class ServiceBackupJobStatusNotification(GfeNotification): def __init__(self): super(ServiceBackupJobStatusNotification, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/UserMessageNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/UserMessageNotification.py index 52043af..8c6bcba 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/UserMessageNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/UserMessageNotification.py @@ -27,8 +27,7 @@ ## from . import GfeNotification - -class UserMessageNotification(GfeNotification.GfeNotification): +class UserMessageNotification(GfeNotification): def __init__(self): super(UserMessageNotification, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py index 14b658f..309f9d7 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py @@ -36,7 +36,7 @@ import numpy import re -from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.level import MasterLevel +from .MasterLevel import MasterLevel LEVEL_NAMING_REGEX = re.compile("^(\d*(?:\.\d*)?)(?:_(\d*(?:\.\d*)?))?([a-zA-Z]+)$")