Revert b9a9ac7..8748091

This rolls back to commit b9a9ac784e.
This commit is contained in:
freemansw1 2016-04-16 16:59:29 -06:00
parent 874809179e
commit 25aeba5224
21 changed files with 51 additions and 61 deletions

2
.gitignore vendored
View file

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

View file

@ -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

View file

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

View file

@ -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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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

View file

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

View file

@ -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

View file

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

View file

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

View file

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

View file

@ -40,11 +40,7 @@ import calendar
import datetime
import numpy
import time
try:
import StringIO
except ImportError:
#python2->3
import io.StringIO as StringIO
import StringIO
from dynamicserialize.dstypes.java.util import Date
from dynamicserialize.dstypes.java.util import EnumSet

View file

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

View file

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

View file

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

View file

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

View file

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