fixing for python 2 compatibility

now requires module six

awips/ThriftClient.py

@@ -17,8 +17,10 @@
 # See the AWIPS II Master Rights File ("Master Rights File.pdf") for
 # further licensing information.
 ##
-
+try:
-import http.client
+    import http.client as httpcl
+except ImportError:
+    import httplib as httpcl
 from dynamicserialize import DynamicSerializationManager
 from dynamicserialize.dstypes.com.raytheon.uf.common.serialization.comm.response import ServerErrorResponse
 from dynamicserialize.dstypes.com.raytheon.uf.common.serialization import SerializableExceptionWrapper
@@ -54,12 +56,12 @@ class ThriftClient:
         if (len(hostParts) > 1):
             hostString = hostParts[0]
             self.__uri = "/" + hostParts[1]
-            self.__httpConn = http.client.HTTPConnection(hostString)
+            self.__httpConn = httpcl.HTTPConnection(hostString)
         else:
             if (port is None):
-                self.__httpConn = http.client.HTTPConnection(host)
+                self.__httpConn = httpcl.HTTPConnection(host)
             else:
-                self.__httpConn = http.client.HTTPConnection(host, port)
+                self.__httpConn = httpcl.HTTPConnection(host, port)
 
             self.__uri = uri
 

awips/dataaccess/__init__.py

@@ -41,8 +41,8 @@ __all__ = [
            ]
 
 import abc
-
+from six import with_metaclass
-class IDataRequest(object, metaclass=abc.ABCMeta):
+class IDataRequest(with_metaclass(abc.ABCMeta, object)):
     """
     An IDataRequest to be submitted to the DataAccessLayer to retrieve data.
     """
@@ -163,7 +163,7 @@ class IDataRequest(object, metaclass=abc.ABCMeta):
 
 
 
-class IData(object, metaclass=abc.ABCMeta):
+class IData(with_metaclass(abc.ABCMeta, object)):
     """
     An IData representing data returned from the DataAccessLayer.
     """

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

@@ -28,8 +28,8 @@
 
 from . import ActiveTableKey
 import abc
-
+from six import with_metaclass
-class ActiveTableRecord(object, metaclass=abc.ABCMeta):
+class ActiveTableRecord(with_metaclass(abc.ABCMeta, object)):
     @abc.abstractmethod
     def __init__(self):
         self.key = ActiveTableKey.ActiveTableKey()

dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/AbstractFailedResponse.py

@@ -22,8 +22,9 @@
 
 import abc
 
+from six import with_metaclass
 
-class AbstractFailedResponse(object, metaclass=abc.ABCMeta):
+class AbstractFailedResponse(with_metaclass(abc.ABCMeta, object)):
     @abc.abstractmethod
     def __init__(self):
         self.request = None

dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractDataAccessRequest.py

@@ -31,8 +31,8 @@
 
 import abc
 
-
+from six import with_metaclass
-class AbstractDataAccessRequest(object, metaclass=abc.ABCMeta):
+class AbstractDataAccessRequest(with_metaclass(abc.ABCMeta, object)):
     def __init__(self):
         self.requestParameters = None
 

dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractIdentifierRequest.py

@@ -30,8 +30,9 @@
 #
 
 import abc
+from six import with_metaclass
 
-class AbstractIdentifierRequest(object, metaclass=abc.ABCMeta):
+class AbstractIdentifierRequest(with_metaclass(abc.ABCMeta, object)):
     def __init__(self):
         self.datatype = None
 

dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/response/AbstractResponseData.py

@@ -21,9 +21,10 @@
 # File auto-generated against equivalent DynamicSerialize Java class
 
 import abc
+from six import with_metaclass
 
 
-class AbstractResponseData(object, metaclass=abc.ABCMeta):
+class AbstractResponseData(with_metaclass(abc.ABCMeta, object)):
     @abc.abstractmethod
     def __init__(self):
         self.time = None

dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/AbstractGfeRequest.py

@@ -21,9 +21,10 @@
 # File auto-generated against equivalent DynamicSerialize Java class
 
 import abc
+from six import with_metaclass
 
 
-class AbstractGfeRequest(object, metaclass=abc.ABCMeta):
+class AbstractGfeRequest(with_metaclass(abc.ABCMeta, object)):
     @abc.abstractmethod
     def __init__(self):
         self.siteID = None

dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetGridDataRequest.py

@@ -23,9 +23,10 @@
 import abc
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.server.request import GetGridRequest
+from six import with_metaclass
 
 
-class GetGridDataRequest(object, metaclass=abc.ABCMeta):
+class GetGridDataRequest(with_metaclass(abc.ABCMeta, object)):
     @abc.abstractmethod
     def __init__(self):
         self.requests = []

dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GfeNotification.py

@@ -25,8 +25,9 @@
 #
 ##
 import abc
+from six import with_metaclass
 
-class GfeNotification(object, metaclass=abc.ABCMeta):
+class GfeNotification(with_metaclass(abc.ABCMeta, object)):
     @abc.abstractmethod
     def __init__(self):
         self.siteID = None

dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/AbstractGridSlice.py

@@ -19,9 +19,9 @@
 ##
 
 import abc
+from six import with_metaclass
 
-
+class AbstractGridSlice(with_metaclass(abc.ABCMeta, object)):
-class AbstractGridSlice(object, metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def __init__(self):
         self.validTime = None

dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/AbstractLocalizationStreamRequest.py

@@ -23,8 +23,9 @@
 import abc
 import os
 from dynamicserialize.dstypes.com.raytheon.uf.common.plugin.nwsauth.user import User
+from six import with_metaclass
 
-class AbstractLocalizationStreamRequest(object, metaclass=abc.ABCMeta):
+class AbstractLocalizationStreamRequest(with_metaclass(abc.ABCMeta, object)):
     @abc.abstractmethod
     def __init__(self):
         self.context = None

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

@@ -31,7 +31,10 @@ import struct
 import socket
 import os
 import pwd
-import _thread
+try:
+    import _thread
+except ImportError:
+    import thread as _thread
 
 class WsId(object):
 

setup.py

@@ -11,6 +11,6 @@ setup(
     download_url='https://github.com/Unidata/python-awips/tarball/0.9.3',
     author='Unidata',
     author_email='mjames@ucar.edu',
-    requires=['argparse','shapely','numpy']
+    requires=['argparse','shapely','numpy','six']
 )