diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py index 25c19fc..236dac1 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py @@ -26,7 +26,7 @@ # ## -import ActiveTableKey +from .ActiveTableKey import ActiveTableKey import abc class ActiveTableRecord(object): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py index 86a959c..94486cf 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py @@ -26,9 +26,9 @@ # ## -import ActiveTableRecord +from .ActiveTableRecord 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 d60e78a..91a9b09 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py @@ -26,9 +26,9 @@ # ## -import ActiveTableRecord +from .ActiveTableRecord 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/level/Level.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py index 9aff411..14b658f 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py @@ -45,11 +45,7 @@ INVALID_VALUE = numpy.float64(-999999) class Level(object): def __init__(self, levelString=None): - try: - self.id = 0L - except SyntaxError: - #we are in python 3, no longer a separate long. - self.id=0 + self.id = 0 self.identifier = None self.masterLevel = None self.levelonevalue = INVALID_VALUE diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py index d2f66b4..3a13605 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py @@ -28,7 +28,7 @@ __all__ = [ 'stream' ] -from LocalizationContext import LocalizationContext -from LocalizationLevel import LocalizationLevel -from LocalizationType import LocalizationType +from .LocalizationContext import LocalizationContext +from .LocalizationLevel import LocalizationLevel +from .LocalizationType import LocalizationType diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py index 7b20af8..1219dbb 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py @@ -40,7 +40,11 @@ import calendar import datetime import numpy import time -import StringIO +try: + import StringIO +except ImportError: + #python2->3 + import io.StringIO as StringIO from dynamicserialize.dstypes.java.util import Date from dynamicserialize.dstypes.java.util import EnumSet diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py index a31aacc..5f570f5 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py @@ -25,6 +25,6 @@ __all__ = [ 'TimeRange' ] -from DataTime import DataTime -from TimeRange import TimeRange +from .DataTime import DataTime +from .TimeRange import TimeRange