mirror of
https://github.com/Unidata/python-awips.git
synced 2025-02-23 14:57:56 -05:00
More python 3 conversion
Cleaning up relative imports to include . syntax.
This commit is contained in:
parent
bb6dfb0970
commit
46bc7672ca
8 changed files with 17 additions and 13 deletions
|
@ -35,7 +35,7 @@
|
|||
__all__ = [
|
||||
]
|
||||
|
||||
import dstypes, adapters
|
||||
import dynamicserialize.adapters as adapters
|
||||
import DynamicSerializationManager
|
||||
|
||||
class SerializationException(Exception):
|
||||
|
|
|
@ -66,10 +66,10 @@ 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 d.has_key('ClassAdapter'):
|
||||
if 'ClassAdapter' in d:
|
||||
if isinstance(m.ClassAdapter, list):
|
||||
for clz in m.ClassAdapter:
|
||||
classAdapterRegistry[clz] = m
|
||||
|
|
|
@ -24,5 +24,5 @@ __all__ = [
|
|||
'DefaultDataRequest'
|
||||
]
|
||||
|
||||
from DefaultDataRequest import DefaultDataRequest
|
||||
from .DefaultDataRequest import DefaultDataRequest
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
# File auto-generated against equivalent DynamicSerialize Java class
|
||||
|
||||
from Property import Property
|
||||
from .Property import Property
|
||||
|
||||
class Header(object):
|
||||
|
||||
|
|
|
@ -31,7 +31,11 @@ import struct
|
|||
import socket
|
||||
import os
|
||||
import pwd
|
||||
import thread
|
||||
try:
|
||||
import thread
|
||||
except ImportError:
|
||||
#this means that we are in python 3.
|
||||
import _thread as thread
|
||||
|
||||
class WsId(object):
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -37,4 +37,4 @@ __all__ = [
|
|||
'Point',
|
||||
]
|
||||
|
||||
from Point import Point
|
||||
from .Point import Point
|
||||
|
|
|
@ -24,5 +24,5 @@ __all__ = [
|
|||
'StackTraceElement'
|
||||
]
|
||||
|
||||
from StackTraceElement import StackTraceElement
|
||||
from .StackTraceElement import StackTraceElement
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue