Revert b9a9ac7..8748091

This rolls back to commit b9a9ac784e.

.gitignore

@@ -1,4 +1,2 @@
 .ipynb_checkpoints
 docs/build/
-
-*.pyc

awips/dataaccess/DataAccessLayer.py

@@ -47,7 +47,7 @@ import subprocess
 THRIFT_HOST = "edex"
 USING_NATIVE_THRIFT = False
 
-if 'jep' in sys.modules:
+if sys.modules.has_key('jep'):
     # intentionally do not catch if this fails to import, we want it to
     # be obvious that something is configured wrong when running from within
     # Java instead of allowing false confidence and fallback behavior

dynamicserialize/__init__.py

@@ -35,7 +35,7 @@
 __all__ = [
            ]
 
-import dynamicserialize.adapters as adapters
+import dstypes, adapters
 import DynamicSerializationManager
 
 class SerializationException(Exception):

dynamicserialize/adapters/__init__.py

@@ -66,10 +66,10 @@ classAdapterRegistry = {}
 def getAdapterRegistry():
     import sys
     for x in __all__:
-        exec('import dynamicserialize.adapters.' + x)
+        exec 'import ' + x
         m = sys.modules['dynamicserialize.adapters.' + x]
         d = m.__dict__
-        if 'ClassAdapter' in d:
+        if d.has_key('ClassAdapter'):
             if isinstance(m.ClassAdapter, list):
                 for clz in m.ClassAdapter:
                     classAdapterRegistry[clz] = m

dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py

@@ -26,7 +26,7 @@
 #
 ##
 
-from .ActiveTableKey import ActiveTableKey
+import ActiveTableKey
 import abc
 
 class ActiveTableRecord(object):

dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py

@@ -26,9 +26,9 @@
 #
 ##
 
-from .ActiveTableRecord import ActiveTableRecord
+import ActiveTableRecord
 
-class OperationalActiveTableRecord(ActiveTableRecord):
+class OperationalActiveTableRecord(ActiveTableRecord.ActiveTableRecord):
 
     def __init__(self):
         super(OperationalActiveTableRecord, self).__init__()

dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py

@@ -26,9 +26,9 @@
 #
 ##
 
-from .ActiveTableRecord import ActiveTableRecord
+import ActiveTableRecord
 
-class PracticeActiveTableRecord(ActiveTableRecord):
+class PracticeActiveTableRecord(ActiveTableRecord.ActiveTableRecord):
 
     def __init__(self):
         super(PracticeActiveTableRecord, self).__init__()

dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py

@@ -41,20 +41,20 @@ __all__ = [
             'response'
           ]
 
-from .ActiveTableKey import ActiveTableKey
+from ActiveTableKey import ActiveTableKey
-from .ActiveTableRecord import ActiveTableRecord
+from ActiveTableRecord import ActiveTableRecord
-from .ActiveTableMode import ActiveTableMode
+from ActiveTableMode import ActiveTableMode
-from .DumpActiveTableRequest import DumpActiveTableRequest
+from DumpActiveTableRequest import DumpActiveTableRequest
-from .DumpActiveTableResponse import DumpActiveTableResponse
+from DumpActiveTableResponse import DumpActiveTableResponse
-from .GetActiveTableDictRequest import GetActiveTableDictRequest
+from GetActiveTableDictRequest import GetActiveTableDictRequest
-from .GetActiveTableDictResponse import GetActiveTableDictResponse
+from GetActiveTableDictResponse import GetActiveTableDictResponse
-from .GetFourCharSitesRequest import GetFourCharSitesRequest
+from GetFourCharSitesRequest import GetFourCharSitesRequest
-from .GetFourCharSitesResponse import GetFourCharSitesResponse
+from GetFourCharSitesResponse import GetFourCharSitesResponse
-from .GetVtecAttributeRequest import GetVtecAttributeRequest
+from GetVtecAttributeRequest import GetVtecAttributeRequest
-from .GetVtecAttributeResponse import GetVtecAttributeResponse
+from GetVtecAttributeResponse import GetVtecAttributeResponse
-from .OperationalActiveTableRecord import OperationalActiveTableRecord
+from OperationalActiveTableRecord import OperationalActiveTableRecord
-from .PracticeActiveTableRecord import PracticeActiveTableRecord
+from PracticeActiveTableRecord import PracticeActiveTableRecord
-from .SendPracticeProductRequest import SendPracticeProductRequest
+from SendPracticeProductRequest import SendPracticeProductRequest
-from .VTECChange import VTECChange
+from VTECChange import VTECChange
-from .VTECTableChangeNotification import VTECTableChangeNotification
+from VTECTableChangeNotification import VTECTableChangeNotification
 

dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/__init__.py

@@ -24,5 +24,5 @@ __all__ = [
             'DefaultDataRequest'
           ]
 
-from .DefaultDataRequest import DefaultDataRequest
+from DefaultDataRequest import DefaultDataRequest
 

dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py

@@ -45,7 +45,7 @@ INVALID_VALUE = numpy.float64(-999999)
 class Level(object):
 
     def __init__(self, levelString=None):
-        self.id = 0
+        self.id = 0L
         self.identifier = None
         self.masterLevel = None
         self.levelonevalue = INVALID_VALUE

dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/__init__.py

@@ -25,6 +25,6 @@ __all__ = [
             'MasterLevel'
           ]
 
-from .Level import Level
+from Level import Level
-from .MasterLevel import MasterLevel
+from MasterLevel import MasterLevel
 

dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py

@@ -28,7 +28,7 @@ __all__ = [
             'stream'
           ]
 
-from .LocalizationContext import LocalizationContext
+from LocalizationContext import LocalizationContext
-from .LocalizationLevel import LocalizationLevel
+from LocalizationLevel import LocalizationLevel
-from .LocalizationType import LocalizationType
+from LocalizationType import LocalizationType
 

dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py

@@ -20,7 +20,7 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
 
-from .Property import Property
+from Property import Property
 
 class Header(object):
 

dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py

@@ -31,11 +31,7 @@ import struct
 import socket
 import os
 import pwd
-try:
+import thread
-    import thread
-except ImportError:
-    #this means that we are in python 3.
-    import _thread as thread
 
 class WsId(object):
 

dynamicserialize/dstypes/com/raytheon/uf/common/message/__init__.py

@@ -40,8 +40,8 @@ __all__ = [
 #
 
 
-from .Body import Body
+from Body import Body
-from .Header import Header
+from Header import Header
-from .Message import Message
+from Message import Message
-from .Property import Property
+from Property import Property
-from .WsId import WsId
+from WsId import WsId

dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py

@@ -40,11 +40,7 @@ import calendar
 import datetime
 import numpy
 import time
-try:
+import StringIO
-    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

dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py

@@ -25,6 +25,6 @@ __all__ = [
             'TimeRange'
           ]
 
-from .DataTime import DataTime
+from DataTime import DataTime
-from .TimeRange import TimeRange
+from TimeRange import TimeRange
 

dynamicserialize/dstypes/com/vividsolutions/jts/geom/__init__.py

@@ -26,7 +26,7 @@ __all__ = [
             'Geometry'
           ]
 
-from .Coordinate import Coordinate
+from Coordinate import Coordinate
-from .Envelope import Envelope
+from Envelope import Envelope
-from .Geometry import Geometry
+from Geometry import Geometry
 

dynamicserialize/dstypes/java/awt/__init__.py

@@ -37,4 +37,4 @@ __all__ = [
            'Point',
            ]
 
-from .Point import Point
+from Point import Point

dynamicserialize/dstypes/java/lang/__init__.py

@@ -24,5 +24,5 @@ __all__ = [
             'StackTraceElement'
           ]
 
-from .StackTraceElement import StackTraceElement
+from StackTraceElement import StackTraceElement
 

dynamicserialize/dstypes/java/util/__init__.py

@@ -27,8 +27,8 @@ __all__ = [
             'GregorianCalendar'
           ]
 
-from .Calendar import Calendar
+from Calendar import Calendar
-from .Date import Date
+from Date import Date
-from .EnumSet import EnumSet
+from EnumSet import EnumSet
-from .GregorianCalendar import GregorianCalendar
+from GregorianCalendar import GregorianCalendar