From 91f230b45a6262ae1c28afa0b8913d4e126cc02e Mon Sep 17 00:00:00 2001 From: freemansw1 Date: Sun, 17 Apr 2016 19:38:33 -0600 Subject: [PATCH] fixing for python 2 compatibility now requires module six --- awips/ThriftClient.py | 12 +++++++----- awips/dataaccess/__init__.py | 6 +++--- .../uf/common/activetable/ActiveTableRecord.py | 4 ++-- .../uf/common/auth/resp/AbstractFailedResponse.py | 3 ++- .../dataaccess/request/AbstractDataAccessRequest.py | 4 ++-- .../dataaccess/request/AbstractIdentifierRequest.py | 3 ++- .../dataaccess/response/AbstractResponseData.py | 3 ++- .../dataplugin/gfe/request/AbstractGfeRequest.py | 3 ++- .../dataplugin/gfe/request/GetGridDataRequest.py | 3 ++- .../dataplugin/gfe/server/notify/GfeNotification.py | 3 ++- .../common/dataplugin/gfe/slice/AbstractGridSlice.py | 4 ++-- .../stream/AbstractLocalizationStreamRequest.py | 3 ++- .../dstypes/com/raytheon/uf/common/message/WsId.py | 5 ++++- setup.py | 2 +- 14 files changed, 35 insertions(+), 23 deletions(-) diff --git a/awips/ThriftClient.py b/awips/ThriftClient.py index 94b24d9..38ed1cc 100644 --- a/awips/ThriftClient.py +++ b/awips/ThriftClient.py @@ -17,8 +17,10 @@ # See the AWIPS II Master Rights File ("Master Rights File.pdf") for # further licensing information. ## - -import http.client +try: + 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 diff --git a/awips/dataaccess/__init__.py b/awips/dataaccess/__init__.py index 389f6e4..c84c076 100644 --- a/awips/dataaccess/__init__.py +++ b/awips/dataaccess/__init__.py @@ -41,8 +41,8 @@ __all__ = [ ] import abc - -class IDataRequest(object, metaclass=abc.ABCMeta): +from six import with_metaclass +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. """ diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py index d201ccb..a1e3106 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py @@ -28,8 +28,8 @@ from . import ActiveTableKey import abc - -class ActiveTableRecord(object, metaclass=abc.ABCMeta): +from six import with_metaclass +class ActiveTableRecord(with_metaclass(abc.ABCMeta, object)): @abc.abstractmethod def __init__(self): self.key = ActiveTableKey.ActiveTableKey() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/AbstractFailedResponse.py b/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/AbstractFailedResponse.py index e852ae9..2d6e991 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/AbstractFailedResponse.py +++ b/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 diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractDataAccessRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractDataAccessRequest.py index a70c46f..9ce388e 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractDataAccessRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractDataAccessRequest.py @@ -31,8 +31,8 @@ import abc - -class AbstractDataAccessRequest(object, metaclass=abc.ABCMeta): +from six import with_metaclass +class AbstractDataAccessRequest(with_metaclass(abc.ABCMeta, object)): def __init__(self): self.requestParameters = None diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractIdentifierRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractIdentifierRequest.py index 337035c..eeca6ca 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractIdentifierRequest.py +++ b/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 diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/response/AbstractResponseData.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/response/AbstractResponseData.py index 7e9520a..6482ec5 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/response/AbstractResponseData.py +++ b/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 diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/AbstractGfeRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/AbstractGfeRequest.py index f5c8209..b31ba16 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/AbstractGfeRequest.py +++ b/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 diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetGridDataRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetGridDataRequest.py index 41b666c..725c3a3 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetGridDataRequest.py +++ b/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 = [] diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GfeNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GfeNotification.py index dd2fca7..d0f0ad8 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GfeNotification.py +++ b/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 diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/AbstractGridSlice.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/AbstractGridSlice.py index 7faae2b..65832cd 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/AbstractGridSlice.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/AbstractGridSlice.py @@ -19,9 +19,9 @@ ## import abc +from six import with_metaclass - -class AbstractGridSlice(object, metaclass=abc.ABCMeta): +class AbstractGridSlice(with_metaclass(abc.ABCMeta, object)): @abc.abstractmethod def __init__(self): self.validTime = None diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/AbstractLocalizationStreamRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/AbstractLocalizationStreamRequest.py index 58d2fb9..c0a61e9 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/AbstractLocalizationStreamRequest.py +++ b/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 diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py index 33627ed..7a73d09 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py +++ b/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): diff --git a/setup.py b/setup.py index 1b9169a..fe6c986 100644 --- a/setup.py +++ b/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'] )