More python 3 conversion

Cleaning up relative imports to include . syntax.
This commit is contained in:
freemansw1 2016-04-14 10:01:35 -06:00
parent bb6dfb0970
commit 46bc7672ca
8 changed files with 17 additions and 13 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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