From f1723334305cb9e61b5b1304090309dac5c058b9 Mon Sep 17 00:00:00 2001 From: Michael James Date: Thu, 6 Sep 2018 12:11:36 -0600 Subject: [PATCH] python3 compliance notebook tested --- awips/AlertVizHandler.py | 2 +- awips/DateTimeConverter.py | 4 +- awips/NotificationMessage.py | 20 +-- awips/QpidSubscriber.py | 4 +- awips/RadarCommon.py | 150 ++++++++++++++++++ awips/ThriftClient.py | 11 +- awips/TimeUtil.py | 7 +- awips/dataaccess/CombinedTimeQuery.py | 2 +- awips/dataaccess/DataNotificationLayer.py | 7 +- awips/dataaccess/DataQueue.py | 2 +- awips/dataaccess/PyGeometryData.py | 8 +- awips/dataaccess/PyNotification.py | 6 +- awips/dataaccess/ThriftClientRouter.py | 2 +- awips/dataaccess/__init__.py | 10 +- awips/localization/LocalizationFileManager.py | 23 +-- awips/qpidingest.py | 6 +- awips/stomp.py | 78 +++++---- awips/tables.py | 4 +- awips/test/Test | 2 +- awips/test/dafTests/baseRadarTestCase.py | 2 +- awips/test/dafTests/params.py | 2 +- awips/test/dafTests/testBinLightning.py | 2 +- awips/test/dafTests/testBufrMosHpc.py | 2 +- awips/test/dafTests/testBufrUa.py | 2 +- awips/test/dafTests/testClimate.py | 2 +- awips/test/dafTests/testCommonObsSpatial.py | 2 +- awips/test/dafTests/testDataTime.py | 2 +- awips/test/dafTests/testFfmp.py | 2 +- awips/test/dafTests/testGrid.py | 2 +- awips/test/dafTests/testHydro.py | 4 +- awips/test/dafTests/testMaps.py | 2 +- awips/test/dafTests/testRadarSpatial.py | 2 +- awips/test/dafTests/testRequestConstraint.py | 12 +- awips/test/dafTests/testSatellite.py | 2 +- awips/test/dafTests/testSfcObs.py | 2 +- awips/test/dafTests/testWarning.py | 2 +- .../testLocalizationFileManager.py | 2 +- awips/test/testQpidTimeToLive.py | 10 +- .../DynamicSerializationManager.py | 4 +- .../ThriftSerializationContext.py | 46 +++--- dynamicserialize/__init__.py | 6 +- .../adapters/CommutativeTimestampAdapter.py | 2 +- .../adapters/DatabaseIDAdapter.py | 2 +- dynamicserialize/adapters/DateAdapter.py | 2 +- dynamicserialize/adapters/EnumSetAdapter.py | 2 +- .../adapters/FormattedDateAdapter.py | 2 +- .../adapters/GeomDataRespAdapter.py | 6 +- .../adapters/GridDataHistoryAdapter.py | 2 +- dynamicserialize/adapters/LockTableAdapter.py | 8 +- dynamicserialize/adapters/ParmIDAdapter.py | 2 +- .../adapters/TimeConstraintsAdapter.py | 2 +- dynamicserialize/adapters/TimestampAdapter.py | 2 +- dynamicserialize/adapters/WsIdAdapter.py | 2 +- dynamicserialize/adapters/__init__.py | 4 +- .../common/activetable/ActiveTableRecord.py | 7 +- .../OperationalActiveTableRecord.py | 4 +- .../activetable/PracticeActiveTableRecord.py | 4 +- .../uf/common/activetable/__init__.py | 32 ++-- .../uf/common/activetable/request/__init__.py | 8 +- .../common/activetable/response/__init__.py | 2 +- .../uf/common/alertviz/AlertVizRequest.py | 2 +- .../raytheon/uf/common/alertviz/__init__.py | 2 +- .../auth/resp/AbstractFailedResponse.py | 5 +- .../raytheon/uf/common/auth/resp/__init__.py | 8 +- .../raytheon/uf/common/auth/user/__init__.py | 4 +- .../dataaccess/impl/DefaultDataRequest.py | 6 +- .../uf/common/dataaccess/impl/__init__.py | 4 +- .../request/AbstractDataAccessRequest.py | 5 +- .../request/AbstractIdentifierRequest.py | 5 +- .../dataaccess/request/GetGridDataRequest.py | 2 +- .../uf/common/dataaccess/request/__init__.py | 28 ++-- .../response/AbstractResponseData.py | 6 +- .../uf/common/dataaccess/response/__init__.py | 14 +- .../events/hazards/requests/__init__.py | 2 +- .../uf/common/dataplugin/gfe/__init__.py | 2 +- .../common/dataplugin/gfe/config/__init__.py | 2 +- .../dataplugin/gfe/db/objects/__init__.py | 12 +- .../dataplugin/gfe/discrete/__init__.py | 2 +- .../uf/common/dataplugin/gfe/grid/__init__.py | 4 +- .../gfe/request/AbstractGfeRequest.py | 6 +- .../gfe/request/GetGridDataRequest.py | 6 +- .../common/dataplugin/gfe/request/__init__.py | 54 +++---- .../dataplugin/gfe/server/lock/__init__.py | 4 +- .../dataplugin/gfe/server/message/__init__.py | 4 +- .../CombinationsFileChangedNotification.py | 2 +- .../server/notify/DBInvChangeNotification.py | 2 +- .../gfe/server/notify/GfeNotification.py | 5 +- .../notify/GridHistoryUpdateNotification.py | 4 +- .../server/notify/GridUpdateNotification.py | 4 +- .../gfe/server/notify/LockNotification.py | 4 +- .../ServiceBackupJobStatusNotification.py | 4 +- .../server/notify/UserMessageNotification.py | 4 +- .../dataplugin/gfe/server/request/__init__.py | 8 +- .../dataplugin/gfe/slice/AbstractGridSlice.py | 8 +- .../common/dataplugin/gfe/slice/__init__.py | 10 +- .../common/dataplugin/gfe/svcbu/__init__.py | 2 +- .../common/dataplugin/gfe/weather/__init__.py | 4 +- .../dataplugin/grid/request/__init__.py | 2 +- .../uf/common/dataplugin/level/Level.py | 2 +- .../uf/common/dataplugin/level/__init__.py | 4 +- .../uf/common/dataplugin/message/__init__.py | 2 +- .../dataplugin/radar/request/__init__.py | 2 +- .../dataplugin/radar/response/__init__.py | 4 +- .../common/dataplugin/text/dbsrv/__init__.py | 2 +- .../text/subscription/request/__init__.py | 2 +- .../dataquery/requests/RequestConstraint.py | 6 +- .../uf/common/dataquery/requests/__init__.py | 2 +- .../uf/common/datastorage/__init__.py | 6 +- .../uf/common/datastorage/records/__init__.py | 14 +- .../common/localization/LocalizationLevel.py | 2 +- .../uf/common/localization/__init__.py | 6 +- .../uf/common/localization/msgs/__init__.py | 16 +- .../AbstractLocalizationStreamRequest.py | 5 +- .../uf/common/localization/stream/__init__.py | 6 +- .../uf/common/management/request/__init__.py | 4 +- .../management/request/diagnostic/__init__.py | 6 +- .../response/diagnostic/__init__.py | 6 +- .../com/raytheon/uf/common/message/Header.py | 2 +- .../com/raytheon/uf/common/message/WsId.py | 7 +- .../raytheon/uf/common/message/__init__.py | 10 +- .../uf/common/pointdata/requests/__init__.py | 2 +- .../com/raytheon/uf/common/pypies/__init__.py | 2 +- .../uf/common/pypies/records/__init__.py | 2 +- .../uf/common/pypies/request/__init__.py | 22 +-- .../uf/common/pypies/response/__init__.py | 10 +- .../uf/common/serialization/__init__.py | 2 +- .../serialization/comm/response/__init__.py | 2 +- .../notify/ClusterActivationNotification.py | 4 +- .../uf/common/site/notify/__init__.py | 4 +- .../uf/common/site/requests/__init__.py | 10 +- .../com/raytheon/uf/common/time/DataTime.py | 23 +-- .../raytheon/uf/common/time/FormattedDate.py | 2 +- .../com/raytheon/uf/common/time/TimeRange.py | 8 +- .../com/raytheon/uf/common/time/__init__.py | 8 +- .../com/vividsolutions/jts/geom/__init__.py | 6 +- .../dataplugin/atcf/request/__init__.py | 2 +- .../dataplugin/gempak/request/__init__.py | 20 +-- .../common/dataplugin/gpd/query/__init__.py | 2 +- .../ncep/common/dataplugin/pgen/__init__.py | 6 +- .../dataplugin/pgen/request/__init__.py | 8 +- .../dataplugin/pgen/response/__init__.py | 4 +- dynamicserialize/dstypes/java/awt/__init__.py | 2 +- .../dstypes/java/lang/__init__.py | 2 +- .../dstypes/java/sql/Timestamp.py | 2 +- dynamicserialize/dstypes/java/sql/__init__.py | 2 +- .../dstypes/java/util/__init__.py | 8 +- 146 files changed, 619 insertions(+), 471 deletions(-) create mode 100644 awips/RadarCommon.py diff --git a/awips/AlertVizHandler.py b/awips/AlertVizHandler.py index 85d0756..8742eb0 100644 --- a/awips/AlertVizHandler.py +++ b/awips/AlertVizHandler.py @@ -18,7 +18,7 @@ # import logging -import NotificationMessage +from . import NotificationMessage class AlertVizHandler(logging.Handler): diff --git a/awips/DateTimeConverter.py b/awips/DateTimeConverter.py index 1a4ba61..8145473 100644 --- a/awips/DateTimeConverter.py +++ b/awips/DateTimeConverter.py @@ -46,10 +46,10 @@ def convertToDateTime(timeArg): return datetime.datetime(*timeArg[:6]) elif isinstance(timeArg, float): # seconds as float, should be avoided due to floating point errors - totalSecs = long(timeArg) + totalSecs = int(timeArg) micros = int((timeArg - totalSecs) * MICROS_IN_SECOND) return _convertSecsAndMicros(totalSecs, micros) - elif isinstance(timeArg, (int, long)): + elif isinstance(timeArg, (int, int)): # seconds as integer totalSecs = timeArg return _convertSecsAndMicros(totalSecs, 0) diff --git a/awips/NotificationMessage.py b/awips/NotificationMessage.py index d61ceb0..93b10d4 100755 --- a/awips/NotificationMessage.py +++ b/awips/NotificationMessage.py @@ -4,14 +4,14 @@ from string import Template import ctypes -import stomp +from . import stomp import socket import sys import time import threading import xml.etree.ElementTree as ET -import ThriftClient +from . import ThriftClient from dynamicserialize.dstypes.com.raytheon.uf.common.alertviz import AlertVizRequest from dynamicserialize import DynamicSerializationManager @@ -75,8 +75,8 @@ class NotificationMessage: priorityInt = int(5) if (priorityInt < 0 or priorityInt > 5): - print "Error occurred, supplied an invalid Priority value: " + str(priorityInt) - print "Priority values are 0, 1, 2, 3, 4 and 5." + print("Error occurred, supplied an invalid Priority value: " + str(priorityInt)) + print("Priority values are 0, 1, 2, 3, 4 and 5.") sys.exit(1) if priorityInt is not None: @@ -86,7 +86,7 @@ class NotificationMessage: def connection_timeout(self, connection): if (connection is not None and not connection.is_connected()): - print "Connection Retry Timeout" + print("Connection Retry Timeout") for tid, tobj in threading._active.items(): if tobj.name is "MainThread": res = ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, ctypes.py_object(SystemExit)) @@ -138,14 +138,14 @@ class NotificationMessage: serverResponse = None try: serverResponse = thriftClient.sendRequest(alertVizRequest) - except Exception, ex: - print "Caught exception submitting AlertVizRequest: ", str(ex) + except Exception as ex: + print("Caught exception submitting AlertVizRequest: ", str(ex)) if (serverResponse != "None"): - print "Error occurred submitting Notification Message to AlertViz receiver: ", serverResponse + print("Error occurred submitting Notification Message to AlertViz receiver: ", serverResponse) sys.exit(1) else: - print "Response: " + str(serverResponse) + print("Response: " + str(serverResponse)) def createRequest(message, priority, source, category, audioFile, filters): obj = AlertVizRequest() @@ -163,4 +163,4 @@ def createRequest(message, priority, source, category, audioFile, filters): return obj if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/awips/QpidSubscriber.py b/awips/QpidSubscriber.py index 695189a..06c4153 100644 --- a/awips/QpidSubscriber.py +++ b/awips/QpidSubscriber.py @@ -58,7 +58,7 @@ class QpidSubscriber: if (topicName == 'edex.alerts'): self.decompress = True - print "Establishing connection to broker on", self.host + print("Establishing connection to broker on", self.host) queueName = topicName + self.__session.name self.__session.queue_declare(queue=queueName, exclusive=True, auto_delete=True, arguments={'qpid.max_count':100, 'qpid.policy_type':'ring'}) self.__session.exchange_bind(exchange='amq.topic', queue=queueName, binding_key=topicName) @@ -69,7 +69,7 @@ class QpidSubscriber: queue = self.__session.incoming(local_queue_name) self.__session.message_subscribe(serverQueueName, destination=local_queue_name) queue.start() - print "Connection complete to broker on", self.host + print("Connection complete to broker on", self.host) self.__queueStarted = True while self.subscribed: diff --git a/awips/RadarCommon.py b/awips/RadarCommon.py new file mode 100644 index 0000000..23e227d --- /dev/null +++ b/awips/RadarCommon.py @@ -0,0 +1,150 @@ +## +## + +# +# Common methods for the a2gtrad and a2advrad scripts. +# +# +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# 08/13/2014 3393 nabowle Initial creation to contain common +# code for a2*radStub scripts. +# 03/15/2015 mjames@ucar Edited/added to awips package as RadarCommon +# +# + +import argparse +import sys + +from datetime import datetime +from datetime import timedelta +from awips import ThriftClient + +from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange +from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.radar.request import GetRadarDataRecordRequest + +def get_datetime_str(record): + """ + Get the datetime string for a record. + + :param record: the record to get data for. + + :returns: datetime string. + """ + return str(record.getDataTime())[0:19].replace(" ","_") + ".0" + +def get_data_type(azdat): + """ + Get the radar file type (radial or raster). + + :param azdat: Boolean. + + :returns: Radial or raster. + """ + if azdat: + dattyp = "radial" + else : + dattyp = "raster" + return dattyp + +def get_hdf5_data(idra): + rdat = [] + azdat = [] + depVals = [] + threshVals = [] + if len(idra) > 0: + for ii in range(len(idra)): + if idra[ii].getName() == b"Data": + rdat = idra[ii] + elif idra[ii].getName() == b"Angles": + azdat = idra[ii] + dattyp = "radial" + elif idra[ii].getName() == b"DependentValues": + depVals = idra[ii].getShortData() + elif idra[ii].getName() == b"Thresholds": + threshVals = idra[ii].getShortData() + + return rdat,azdat,depVals,threshVals + + +def get_header(record, format, xLen, yLen, azdat, description): + # Encode dimensions, time, mapping, description, tilt, and VCP + mytime = get_datetime_str(record) + dattyp = get_data_type(azdat) + + if format : + msg = str(xLen) + " " + str(yLen) + " " + mytime + " " + \ + dattyp + " " + str(record.getLatitude()) + " " + \ + str(record.getLongitude()) + " " + \ + str(record.getElevation()) + " " + \ + str(record.getElevationNumber()) + " " + \ + description + " " + str(record.getTrueElevationAngle()) + " " + \ + str(record.getVolumeCoveragePattern()) + "\n" +#"%.1f"% + else : + msg = str(xLen) + " " + str(yLen) + " " + mytime + " " + \ + dattyp + " " + description + " " + \ + str(record.getTrueElevationAngle()) + " " + \ + str(record.getVolumeCoveragePattern()) + "\n" + + return msg + + +def encode_thresh_vals(threshVals): + spec = [".", "TH", "ND", "RF", "BI", "GC", "IC", "GR", "WS", "DS", + "RA", "HR", "BD", "HA", "UK"] + nnn = len(threshVals) + j = 0 + msg = "" + while j 14 : + msg += "." + else : + msg += spec[lo] + continue + if hi % 16 >= 8 : + msg += ">" + elif hi % 8 >= 4 : + msg += "<" + if hi % 4 >= 2 : + msg += "+" + elif hi % 2 >= 1 : + msg += "-" + if hi >= 64 : + msg += "%.2f"%(lo*0.01) + elif hi % 64 >= 32 : + msg += "%.2f"%(lo*0.05) + elif hi % 32 >= 16 : + msg += "%.1f"%(lo*0.1) + else : + msg += str(lo) + msg += "\n" + return msg + + +def encode_dep_vals(depVals): + nnn = len(depVals) + j = 0 + msg = [] + while j 1): hostString = hostParts[0] self.__uri = "/" + hostParts[1] - self.__httpConn = httplib.HTTPConnection(hostString) + self.__httpConn = httpcl.HTTPConnection(hostString) else: if (port is None): - self.__httpConn = httplib.HTTPConnection(host) + self.__httpConn = httpcl.HTTPConnection(host) else: - self.__httpConn = httplib.HTTPConnection(host, port) + self.__httpConn = httpcl.HTTPConnection(host, port) self.__uri = uri diff --git a/awips/TimeUtil.py b/awips/TimeUtil.py index 4094dfa..adb58a2 100644 --- a/awips/TimeUtil.py +++ b/awips/TimeUtil.py @@ -53,7 +53,6 @@ def determineDrtOffset(timeStr): times = timeStr.split(",") t1 = makeTime(times[0]) t2 = makeTime(times[1]) - #print "time offset", t1-t2, (t1-t2)/3600 return t1-t2, launchStr # Check for synchronized mode synch = 0 @@ -61,22 +60,18 @@ def determineDrtOffset(timeStr): timeStr = timeStr[1:] synch = 1 drt_t = makeTime(timeStr) - #print "input", year, month, day, hour, minute gm = time.gmtime() cur_t = time.mktime(gm) # Synchronize to most recent hour # i.e. "truncate" cur_t to most recent hour. - #print "gmtime", gm if synch: cur_t = time.mktime((gm[0], gm[1], gm[2], gm[3], 0, 0, 0, 0, 0)) - curStr = '%4s%2s%2s_%2s00\n' % (`gm[0]`,`gm[1]`,`gm[2]`,`gm[3]`) + curStr = '%4s%2s%2s_%2s00\n' % (gm[0],gm[1],gm[2],gm[3]) curStr = curStr.replace(' ','0') launchStr = timeStr + "," + curStr - #print "drt, cur", drt_t, cur_t offset = drt_t - cur_t - #print "offset", offset, offset/3600, launchStr return int(offset), launchStr def makeTime(timeStr): diff --git a/awips/dataaccess/CombinedTimeQuery.py b/awips/dataaccess/CombinedTimeQuery.py index 947bc38..6385d66 100644 --- a/awips/dataaccess/CombinedTimeQuery.py +++ b/awips/dataaccess/CombinedTimeQuery.py @@ -80,4 +80,4 @@ def __cloneRequest(request): levels = request.getLevels(), locationNames = request.getLocationNames(), envelope = request.getEnvelope(), - **request.getIdentifiers()) \ No newline at end of file + **request.getIdentifiers()) diff --git a/awips/dataaccess/DataNotificationLayer.py b/awips/dataaccess/DataNotificationLayer.py index 2c130c5..8c549d0 100644 --- a/awips/dataaccess/DataNotificationLayer.py +++ b/awips/dataaccess/DataNotificationLayer.py @@ -56,16 +56,13 @@ from awips.dataaccess.PyGeometryNotification import PyGeometryNotification from awips.dataaccess.PyGridNotification import PyGridNotification -THRIFT_HOST = subprocess.check_output( - "source /awips2/fxa/bin/setup.env; echo $DEFAULT_HOST", - shell=True).strip() - +THRIFT_HOST = "edex" USING_NATIVE_THRIFT = False JMS_HOST_PATTERN=re.compile('tcp://([^:]+):([0-9]+)') -if sys.modules.has_key('jep'): +if 'jep' in sys.modules: # 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 diff --git a/awips/dataaccess/DataQueue.py b/awips/dataaccess/DataQueue.py index a5325f0..48bd113 100644 --- a/awips/dataaccess/DataQueue.py +++ b/awips/dataaccess/DataQueue.py @@ -193,4 +193,4 @@ class DataQueue(object): return self def __exit__(self, *unused): - self.close() \ No newline at end of file + self.close() diff --git a/awips/dataaccess/PyGeometryData.py b/awips/dataaccess/PyGeometryData.py index 62c54ee..7ad2539 100644 --- a/awips/dataaccess/PyGeometryData.py +++ b/awips/dataaccess/PyGeometryData.py @@ -29,18 +29,18 @@ class PyGeometryData(IGeometryData, PyData.PyData): self.__geometry = geometry self.__dataMap = {} tempDataMap = geoDataRecord.getDataMap() - for key, value in tempDataMap.items(): + for key, value in list(tempDataMap.items()): self.__dataMap[key] = (value[0], value[1], value[2]) def getGeometry(self): return self.__geometry def getParameters(self): - return self.__dataMap.keys() + return list(self.__dataMap.keys()) def getString(self, param): value = self.__dataMap[param][0] - return str(value) + return value def getNumber(self, param): value = self.__dataMap[param][0] @@ -48,7 +48,7 @@ class PyGeometryData(IGeometryData, PyData.PyData): if t == 'INT' or t == 'SHORT': return int(value) elif t == 'LONG': - return long(value) + return int(value) elif t == 'FLOAT': return float(value) elif t == 'DOUBLE': diff --git a/awips/dataaccess/PyNotification.py b/awips/dataaccess/PyNotification.py index 163e441..95cc4e3 100644 --- a/awips/dataaccess/PyNotification.py +++ b/awips/dataaccess/PyNotification.py @@ -15,7 +15,7 @@ # Sep 07, 2017 6175 tgurney Override messageReceived in subclasses # - +from six import with_metaclass import abc import time import traceback @@ -28,14 +28,12 @@ from awips.ThriftClient import ThriftRequestException from dynamicserialize.dstypes.com.raytheon.uf.common.time import DataTime -class PyNotification(INotificationSubscriber): +class PyNotification(with_metaclass(abc.ABCMeta, INotificationSubscriber)): """ Receives notifications for new data and retrieves the data that meets specified filtering criteria. """ - __metaclass__ = abc.ABCMeta - def __init__(self, request, filter, host='localhost', port=5672, requestHost='localhost'): self.DAL = DataAccessLayer self.DAL.changeEDEXHost(requestHost) diff --git a/awips/dataaccess/ThriftClientRouter.py b/awips/dataaccess/ThriftClientRouter.py index afe04f9..99efaf3 100644 --- a/awips/dataaccess/ThriftClientRouter.py +++ b/awips/dataaccess/ThriftClientRouter.py @@ -106,7 +106,7 @@ class ThriftClientRouter(object): response = self._client.sendRequest(gridDataRequest) locSpecificData = {} - locNames = response.getSiteNxValues().keys() + locNames = list(response.getSiteNxValues().keys()) for location in locNames: nx = response.getSiteNxValues()[location] ny = response.getSiteNyValues()[location] diff --git a/awips/dataaccess/__init__.py b/awips/dataaccess/__init__.py index f28f178..53f7c53 100644 --- a/awips/dataaccess/__init__.py +++ b/awips/dataaccess/__init__.py @@ -26,6 +26,7 @@ __all__ = [ ] import abc +from six import with_metaclass class IDataRequest(object): """ @@ -149,11 +150,10 @@ class IDataRequest(object): -class IData(object): +class IData(with_metaclass(abc.ABCMeta, object)): """ An IData representing data returned from the DataAccessLayer. """ - __metaclass__ = abc.ABCMeta @abc.abstractmethod def getAttribute(self, key): @@ -337,12 +337,11 @@ class IGeometryData(IData): return -class INotificationSubscriber(object): +class INotificationSubscriber(with_metaclass(abc.ABCMeta, object)): """ An INotificationSubscriber representing a notification filter returned from the DataNotificationLayer. """ - __metaclass__ = abc.ABCMeta @abc.abstractmethod def subscribe(self, callback): @@ -361,12 +360,11 @@ class INotificationSubscriber(object): """Closes the notification subscriber""" pass -class INotificationFilter(object): +class INotificationFilter(with_metaclass(abc.ABCMeta, object)): """ Represents data required to filter a set of URIs and return a corresponding list of IDataRequest to retrieve data for. """ - __metaclass__ = abc.ABCMeta @abc.abstractmethod def accept(dataUri): pass diff --git a/awips/localization/LocalizationFileManager.py b/awips/localization/LocalizationFileManager.py index ac0d425..2f9dc31 100644 --- a/awips/localization/LocalizationFileManager.py +++ b/awips/localization/LocalizationFileManager.py @@ -15,7 +15,10 @@ import urllib2 from json import load as loadjson from xml.etree.ElementTree import parse as parseXml from base64 import b64encode -from StringIO import StringIO +try: + from StringIO import StringIO +except ImportError: + from io import StringIO from getpass import getuser import dateutil.parser import contextlib @@ -103,7 +106,7 @@ class _LocalizationOutput(StringIO): urllib2.urlopen(request) except urllib2.HTTPError as e: if e.code == 409: - raise LocalizationFileVersionConflictException, e.read() + raise LocalizationFileVersionConflictException(e.read()) else: raise e def __enter__(self): @@ -166,12 +169,12 @@ class LocalizationFile(object): if not(self.isDirectory()): checksum = response.headers["Content-MD5"] if self.checksum != checksum: - raise RuntimeError, "Localization checksum mismatch " + self.checksum + " " + checksum + raise RuntimeError("Localization checksum mismatch " + self.checksum + " " + checksum) return contextlib.closing(response) elif mode == 'w': return _LocalizationOutput(self._manager, self) else: - raise ValueError, "mode string must be 'r' or 'w' not " + str(r) + raise ValueError("mode string must be 'r' or 'w' not " + str(r)) def delete(self): """Delete this file from the server""" request = self._manager._buildRequest(self.context, self.path, method='DELETE') @@ -180,7 +183,7 @@ class LocalizationFile(object): urllib2.urlopen(request) except urllib2.HTTPError as e: if e.code == 409: - raise LocalizationFileVersionConflictException, e.read() + raise LocalizationFileVersionConflictException(e.read()) else: raise e def exists(self): @@ -333,7 +336,7 @@ class LocalizationFileManager(object): exists = True if not(response.geturl().endswith("/")): # For ordinary files the server sends a redirect to remove the slash. - raise LocalizationFileIsNotDirectoryException, "Not a directory: " + path + raise LocalizationFileIsNotDirectoryException("Not a directory: " + path) elif response.headers["Content-Type"] == "application/xml": fileList += _parseXmlList(self, response, context, path) else: @@ -342,7 +345,7 @@ class LocalizationFileManager(object): if e.code != 404: raise e if not(exists): - raise LocalizationFileDoesNotExistException, "No such file or directory: " + path + raise LocalizationFileDoesNotExistException("No such file or directory: " + path) return fileList def _get(self, context, path): path = self._normalizePath(path) @@ -353,10 +356,10 @@ class LocalizationFileManager(object): checksum = DIRECTORY_CHECKSUM; else: if "Content-MD5" not in resp.headers: - raise RuntimeError, "Missing Content-MD5 header in response from " + resp.geturl() + raise RuntimeError("Missing Content-MD5 header in response from " + resp.geturl()) checksum = resp.headers["Content-MD5"] if "Last-Modified" not in resp.headers: - raise RuntimeError, "Missing Last-Modified header in response from " + resp.geturl() + raise RuntimeError("Missing Last-Modified header in response from " + resp.geturl()) timestamp = dateutil.parser.parse(resp.headers["Last-Modified"]) return LocalizationFile(self, context, path, checksum, timestamp) except urllib2.HTTPError as e: @@ -447,7 +450,7 @@ class LocalizationFileManager(object): for context in self._contexts: if context.level == level: return self._get(context, path) - raise ValueError, "No context defined for level " + level + raise ValueError("No context defined for level " + level) def __str__(self): contextsStr = '[' + ' '.join((str(c) for c in self._contexts)) + ']' return '<' + self.__class__.__name__ + " for " + self._baseUrl + ' ' + contextsStr + '>' diff --git a/awips/qpidingest.py b/awips/qpidingest.py index 0a9dc1b..6ed3f42 100644 --- a/awips/qpidingest.py +++ b/awips/qpidingest.py @@ -103,9 +103,9 @@ class IngestViaQPID: self.connection.start() self.session = self.connection.session(str(uuid4())) self.session.exchange_bind(exchange='amq.direct', queue='external.dropbox', binding_key='external.dropbox') - print 'Connected to Qpid' + print('Connected to Qpid') except: - print 'Unable to connect to Qpid' + print('Unable to connect to Qpid') def sendmessage(self, filepath, header): ''' @@ -126,4 +126,4 @@ class IngestViaQPID: there are no threads left open ''' self.session.close(timeout=10) - print 'Connection to Qpid closed' + print('Connection to Qpid closed') diff --git a/awips/stomp.py b/awips/stomp.py index 5eefa78..cdefe73 100644 --- a/awips/stomp.py +++ b/awips/stomp.py @@ -64,18 +64,26 @@ """ +from __future__ import print_function import hashlib import math import random import re import socket import sys -import thread import threading import time import types import xml.dom.minidom -from cStringIO import StringIO +try: + from StringIO import StringIO +except ImportError: + from io import StringIO +from functools import reduce +try: + import _thread +except ImportError: + import thread # # stomp.py version number @@ -89,14 +97,14 @@ def _uuid( *args ): (http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/213761) """ - t = long( time.time() * 1000 ) - r = long( random.random() * 100000000000000000L ) + t = int( time.time() * 1000 ) + r = int( random.random() * 100000000000000000 ) try: a = socket.gethostbyname( socket.gethostname() ) except: # if we can't get a network address, just imagine one - a = random.random() * 100000000000000000L + a = random.random() * 100000000000000000 data = str(t) + ' ' + str(r) + ' ' + str(a) + ' ' + str(args) md5 = hashlib.md5() md5.update(data) @@ -109,7 +117,7 @@ class DevNullLogger(object): dummy logging class for environments without the logging module """ def log(self, msg): - print msg + print(msg) def devnull(self, msg): pass @@ -354,7 +362,7 @@ class Connection(object): """ self.__running = True self.__attempt_connection() - thread.start_new_thread(self.__receiver_loop, ()) + _thread.start_new_thread(self.__receiver_loop, ()) def stop(self): """ @@ -417,7 +425,7 @@ class Connection(object): def begin(self, headers={}, **keyword_headers): use_headers = self.__merge_headers([headers, keyword_headers]) - if not 'transaction' in use_headers.keys(): + if not 'transaction' in list(use_headers.keys()): use_headers['transaction'] = _uuid() self.__send_frame_helper('BEGIN', '', use_headers, [ 'transaction' ]) return use_headers['transaction'] @@ -429,7 +437,7 @@ class Connection(object): self.__send_frame_helper('COMMIT', '', self.__merge_headers([headers, keyword_headers]), [ 'transaction' ]) def connect(self, headers={}, **keyword_headers): - if keyword_headers.has_key('wait') and keyword_headers['wait']: + if 'wait' in keyword_headers and keyword_headers['wait']: while not self.is_connected(): time.sleep(0.1) del keyword_headers['wait'] self.__send_frame_helper('CONNECT', '', self.__merge_headers([self.__connect_headers, headers, keyword_headers]), [ ]) @@ -515,11 +523,11 @@ class Connection(object): if type(required_header_key) == tuple: found_alternative = False for alternative in required_header_key: - if alternative in headers.keys(): + if alternative in list(headers.keys()): found_alternative = True if not found_alternative: raise KeyError("Command %s requires one of the following headers: %s" % (command, str(required_header_key))) - elif not required_header_key in headers.keys(): + elif not required_header_key in list(headers.keys()): raise KeyError("Command %s requires header %r" % (command, required_header_key)) self.__send_frame(command, headers, payload) @@ -533,7 +541,7 @@ class Connection(object): if self.__socket is not None: frame = '%s\n%s\n%s\x00' % (command, - reduce(lambda accu, key: accu + ('%s:%s\n' % (key, headers[key])), headers.keys(), ''), + reduce(lambda accu, key: accu + ('%s:%s\n' % (key, list(headers[key]))), headers.keys(), ''), payload) self.__socket.sendall(frame) log.debug("Sent frame: type=%s, headers=%r, body=%r" % (command, headers, payload)) @@ -690,7 +698,7 @@ class Connection(object): assert len(pair) == 2 entries[pair[0]] = pair[1] return entries - except Exception, ex: + except Exception as ex: # unable to parse message. return original return body @@ -745,7 +753,7 @@ class Connection(object): break except socket.error: self.__socket = None - if type(sys.exc_info()[1]) == types.TupleType: + if type(sys.exc_info()[1]) == tuple: exc = sys.exc_info()[1][1] else: exc = sys.exc_info()[1] @@ -796,20 +804,20 @@ if __name__ == '__main__': self.c.start() def __print_async(self, frame_type, headers, body): - print "\r \r", - print frame_type - for header_key in headers.keys(): - print '%s: %s' % (header_key, headers[header_key]) - print - print body - print '> ', + print("\r \r",) + print(frame_type) + for header_key in list(headers.keys()): + print('%s: %s' % (header_key, headers[header_key])) + print("") + print(body) + print('> ',) sys.stdout.flush() def on_connecting(self, host_and_port): self.c.connect(wait=True) def on_disconnected(self): - print "lost connection" + print("lost connection") def on_message(self, headers, body): self.__print_async("MESSAGE", headers, body) @@ -833,13 +841,13 @@ if __name__ == '__main__': self.c.abort(transaction=args[1]) def begin(self, args): - print 'transaction id: %s' % self.c.begin() + print('transaction id: %s' % self.c.begin()) def commit(self, args): if len(args) < 2: - print 'expecting: commit ' + print('expecting: commit ') else: - print 'committing %s' % args[1] + print('committing %s' % args[1]) self.c.commit(transaction=args[1]) def disconnect(self, args): @@ -850,35 +858,35 @@ if __name__ == '__main__': def send(self, args): if len(args) < 3: - print 'expecting: send ' + print('expecting: send ') else: self.c.send(destination=args[1], message=' '.join(args[2:])) def sendtrans(self, args): if len(args) < 3: - print 'expecting: sendtrans ' + print('expecting: sendtrans ') else: self.c.send(destination=args[1], message="%s\n" % ' '.join(args[3:]), transaction=args[2]) def subscribe(self, args): if len(args) < 2: - print 'expecting: subscribe [ack]' + print('expecting: subscribe [ack]') elif len(args) > 2: - print 'subscribing to "%s" with acknowledge set to "%s"' % (args[1], args[2]) + print('subscribing to "%s" with acknowledge set to "%s"' % (args[1], args[2])) self.c.subscribe(destination=args[1], ack=args[2]) else: - print 'subscribing to "%s" with auto acknowledge' % args[1] + print('subscribing to "%s" with auto acknowledge' % args[1]) self.c.subscribe(destination=args[1], ack='auto') def unsubscribe(self, args): if len(args) < 2: - print 'expecting: unsubscribe ' + print('expecting: unsubscribe ') else: - print 'unsubscribing from "%s"' % args[1] + print('unsubscribing from "%s"' % args[1]) self.c.unsubscribe(destination=args[1]) if len(sys.argv) > 5: - print 'USAGE: stomp.py [host] [port] [user] [passcode]' + print('USAGE: stomp.py [host] [port] [user] [passcode]') sys.exit(1) if len(sys.argv) >= 2: @@ -900,7 +908,7 @@ if __name__ == '__main__': st = StompTester(host, port, user, passcode) try: while True: - line = raw_input("\r> ") + line = input("\r> ") if not line or line.lstrip().rstrip() == '': continue elif 'quit' in line or 'disconnect' in line: @@ -910,7 +918,7 @@ if __name__ == '__main__': if not command.startswith("on_") and hasattr(st, command): getattr(st, command)(split) else: - print 'unrecognized command' + print('unrecognized command') finally: st.disconnect(None) diff --git a/awips/tables.py b/awips/tables.py index fbda2b4..883795f 100644 --- a/awips/tables.py +++ b/awips/tables.py @@ -1965,7 +1965,7 @@ upgradeHazardsDict = { def checkForUpgrade(pPhen, pSig, cPhen, cSig): proposed = pPhen + "." + pSig current = cPhen + "." + cSig - if upgradeHazardsDict.has_key(proposed): + if proposed in upgradeHazardsDict: if current in upgradeHazardsDict[proposed]: return 1 else: @@ -2016,7 +2016,7 @@ downgradeHazardsDict = { def checkForDowngrade(pPhen, pSig, cPhen, cSig): proposed = pPhen + "." + pSig current = cPhen + "." + cSig - if downgradeHazardsDict.has_key(proposed): + if proposed in downgradeHazardsDict: if current in downgradeHazardsDict[proposed]: return 1 else: diff --git a/awips/test/Test b/awips/test/Test index 24232f1..3755062 100644 --- a/awips/test/Test +++ b/awips/test/Test @@ -23,7 +23,7 @@ import os import logging from awips import AlertVizHandler -import Record +from . import Record avh = AlertVizHandler.AlertVizHandler(host=os.getenv("BROKER_ADDR","localhost"), port=9581, category='LOCAL', source='ANNOUNCER', level=logging.NOTSET) record = Record.Record(10) diff --git a/awips/test/dafTests/baseRadarTestCase.py b/awips/test/dafTests/baseRadarTestCase.py index b109014..ba4a868 100644 --- a/awips/test/dafTests/baseRadarTestCase.py +++ b/awips/test/dafTests/baseRadarTestCase.py @@ -99,7 +99,7 @@ class BaseRadarTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getAttribute('icao'), 1000) def testGetDataWithEqualsLong(self): - gridData = self.runConstraintTest('icao', '=', 1000L) + gridData = self.runConstraintTest('icao', '=', 1000) for record in gridData: self.assertEqual(record.getAttribute('icao'), 1000) diff --git a/awips/test/dafTests/params.py b/awips/test/dafTests/params.py index 8afe38d..cd635c3 100644 --- a/awips/test/dafTests/params.py +++ b/awips/test/dafTests/params.py @@ -23,4 +23,4 @@ STATION_ID = '72558' RADAR = 'KOAX' SAMPLE_AREA = (-97.0, 41.0, -96.0, 42.0) -ENVELOPE = box(*SAMPLE_AREA) \ No newline at end of file +ENVELOPE = box(*SAMPLE_AREA) diff --git a/awips/test/dafTests/testBinLightning.py b/awips/test/dafTests/testBinLightning.py index 830d774..05d8ac8 100644 --- a/awips/test/dafTests/testBinLightning.py +++ b/awips/test/dafTests/testBinLightning.py @@ -103,7 +103,7 @@ class BinLightningTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getAttribute('source'), 1000) def testGetDataWithEqualsLong(self): - geomData = self._runConstraintTest('source', '=', 1000L) + geomData = self._runConstraintTest('source', '=', 1000) for record in geomData: self.assertEqual(record.getAttribute('source'), 1000) diff --git a/awips/test/dafTests/testBufrMosHpc.py b/awips/test/dafTests/testBufrMosHpc.py index 4e375c0..0d55be9 100644 --- a/awips/test/dafTests/testBufrMosHpc.py +++ b/awips/test/dafTests/testBufrMosHpc.py @@ -30,4 +30,4 @@ class BufrMosHpcTestCase(baseBufrMosTestCase.BufrMosTestCase): datatype = "bufrmosHPC" data_params = "forecastHr", "maxTemp24Hour" - # All tests inherited from superclass \ No newline at end of file + # All tests inherited from superclass diff --git a/awips/test/dafTests/testBufrUa.py b/awips/test/dafTests/testBufrUa.py index baefa85..d32b55d 100644 --- a/awips/test/dafTests/testBufrUa.py +++ b/awips/test/dafTests/testBufrUa.py @@ -120,7 +120,7 @@ class BufrUaTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getString('rptType'), '2022') def testGetDataWithEqualsLong(self): - geometryData = self._runConstraintTest('reportType', '=', 2022L) + geometryData = self._runConstraintTest('reportType', '=', 2022) for record in geometryData: self.assertEqual(record.getString('rptType'), '2022') diff --git a/awips/test/dafTests/testClimate.py b/awips/test/dafTests/testClimate.py index da40aad..82aa86d 100644 --- a/awips/test/dafTests/testClimate.py +++ b/awips/test/dafTests/testClimate.py @@ -255,7 +255,7 @@ class ClimateTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getNumber('avg_daily_max'), 70) def testGetDataWithEqualsLong(self): - geometryData = self._runConstraintTest('avg_daily_max', '=', 70L) + geometryData = self._runConstraintTest('avg_daily_max', '=', 70) for record in geometryData: self.assertEqual(record.getNumber('avg_daily_max'), 70) diff --git a/awips/test/dafTests/testCommonObsSpatial.py b/awips/test/dafTests/testCommonObsSpatial.py index 81a9ef4..d6db1fa 100644 --- a/awips/test/dafTests/testCommonObsSpatial.py +++ b/awips/test/dafTests/testCommonObsSpatial.py @@ -81,7 +81,7 @@ class CommonObsSpatialTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getNumber('catalogtype'), 32) def testGetDataWithEqualsLong(self): - geometryData = self._runConstraintTest('elevation', '=', 0L) + geometryData = self._runConstraintTest('elevation', '=', 0) for record in geometryData: self.assertEqual(record.getNumber('elevation'), 0) diff --git a/awips/test/dafTests/testDataTime.py b/awips/test/dafTests/testDataTime.py index 9f104c5..ac9487d 100644 --- a/awips/test/dafTests/testDataTime.py +++ b/awips/test/dafTests/testDataTime.py @@ -114,4 +114,4 @@ class DataTimeTestCase(unittest.TestCase): '2016-08-02 01:23:45.456_(17:34)[2016-08-02_02:34:45.0--2016-08-02_03:45:56.0]' ] for time in times: - self.assertEqual(DataTime(time), DataTime(str(DataTime(time))), time) \ No newline at end of file + self.assertEqual(DataTime(time), DataTime(str(DataTime(time))), time) diff --git a/awips/test/dafTests/testFfmp.py b/awips/test/dafTests/testFfmp.py index a4c1769..5502070 100644 --- a/awips/test/dafTests/testFfmp.py +++ b/awips/test/dafTests/testFfmp.py @@ -208,4 +208,4 @@ class FfmpTestCase(baseDafTestCase.DafTestCase): req.addIdentifier('siteKey', self.location) req.addIdentifier('huc', 'ALL') req.setParameters('FFG0124hr') - self.runGeometryDataTest(req, checkDataTimes=False) \ No newline at end of file + self.runGeometryDataTest(req, checkDataTimes=False) diff --git a/awips/test/dafTests/testGrid.py b/awips/test/dafTests/testGrid.py index 15e6922..543a787 100644 --- a/awips/test/dafTests/testGrid.py +++ b/awips/test/dafTests/testGrid.py @@ -138,7 +138,7 @@ class GridTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getAttribute('info.level.levelonevalue'), 2000) def testGetDataWithEqualsLong(self): - gridData = self._runConstraintTest('info.level.levelonevalue', '=', 2000L) + gridData = self._runConstraintTest('info.level.levelonevalue', '=', 2000) for record in gridData: self.assertEqual(record.getAttribute('info.level.levelonevalue'), 2000) diff --git a/awips/test/dafTests/testHydro.py b/awips/test/dafTests/testHydro.py index fd655ed..63cefeb 100644 --- a/awips/test/dafTests/testHydro.py +++ b/awips/test/dafTests/testHydro.py @@ -152,9 +152,9 @@ class HydroTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getNumber('value'), 3) def testGetDataWithEqualsLong(self): - geometryData = self._runConstraintTest('value', '=', 3L) + geometryData = self._runConstraintTest('value', '=', 3) for record in geometryData: - self.assertEqual(record.getNumber('value'), 3L) + self.assertEqual(record.getNumber('value'), 3) def testGetDataWithEqualsFloat(self): geometryData = self._runConstraintTest('value', '=', 3.0) diff --git a/awips/test/dafTests/testMaps.py b/awips/test/dafTests/testMaps.py index 14ad3c2..7e73bd1 100644 --- a/awips/test/dafTests/testMaps.py +++ b/awips/test/dafTests/testMaps.py @@ -120,7 +120,7 @@ class MapsTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getNumber('reservoir'), 1) def testGetDataWithEqualsLong(self): - geometryData = self._runConstraintTest('reservoir', '=', 1L) + geometryData = self._runConstraintTest('reservoir', '=', 1) for record in geometryData: self.assertEqual(record.getNumber('reservoir'), 1) diff --git a/awips/test/dafTests/testRadarSpatial.py b/awips/test/dafTests/testRadarSpatial.py index 3ef28df..fd93730 100644 --- a/awips/test/dafTests/testRadarSpatial.py +++ b/awips/test/dafTests/testRadarSpatial.py @@ -81,7 +81,7 @@ class RadarSpatialTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getNumber('immutablex'), 57) def testGetDataWithEqualsLong(self): - geometryData = self._runConstraintTest('immutablex', '=', 57L) + geometryData = self._runConstraintTest('immutablex', '=', 57) for record in geometryData: self.assertEqual(record.getNumber('immutablex'), 57) diff --git a/awips/test/dafTests/testRequestConstraint.py b/awips/test/dafTests/testRequestConstraint.py index e7841b8..a824214 100644 --- a/awips/test/dafTests/testRequestConstraint.py +++ b/awips/test/dafTests/testRequestConstraint.py @@ -30,7 +30,7 @@ class RequestConstraintTestCase(unittest.TestCase): self.assertTrue(new('=', 3).evaluate(3)) self.assertTrue(new('=', 3).evaluate('3')) self.assertTrue(new('=', '3').evaluate(3)) - self.assertTrue(new('=', 12345).evaluate(12345L)) + self.assertTrue(new('=', 12345).evaluate(12345)) self.assertTrue(new('=', 'a').evaluate('a')) self.assertTrue(new('=', 'a').evaluate(u'a')) self.assertTrue(new('=', 1.0001).evaluate(2.0 - 0.999999)) @@ -51,7 +51,7 @@ class RequestConstraintTestCase(unittest.TestCase): self.assertFalse(new('!=', 3).evaluate('3')) self.assertFalse(new('!=', '3').evaluate(3)) self.assertFalse(new('!=', 3).evaluate(3)) - self.assertFalse(new('!=', 12345).evaluate(12345L)) + self.assertFalse(new('!=', 12345).evaluate(12345)) self.assertFalse(new('!=', 'a').evaluate('a')) self.assertFalse(new('!=', 'a').evaluate(u'a')) self.assertFalse(new('!=', 1.0001).evaluate(2.0 - 0.9999)) @@ -62,7 +62,7 @@ class RequestConstraintTestCase(unittest.TestCase): self.assertTrue(new('>', 'a').evaluate('b')) self.assertTrue(new('>', 3).evaluate(4)) self.assertFalse(new('>', 20).evaluate(3)) - self.assertFalse(new('>', 12345).evaluate(12345L)) + self.assertFalse(new('>', 12345).evaluate(12345)) self.assertFalse(new('>', 'a').evaluate('a')) self.assertFalse(new('>', 'z').evaluate('a')) self.assertFalse(new('>', 4).evaluate(3)) @@ -70,7 +70,7 @@ class RequestConstraintTestCase(unittest.TestCase): def testEvaluateGreaterThanEquals(self): new = RequestConstraint.new self.assertTrue(new('>=', 3).evaluate(3)) - self.assertTrue(new('>=', 12345).evaluate(12345L)) + self.assertTrue(new('>=', 12345).evaluate(12345)) self.assertTrue(new('>=', 'a').evaluate('a')) self.assertTrue(new('>=', 1.0001).evaluate(1.0002)) self.assertTrue(new('>=', 'a').evaluate('b')) @@ -84,7 +84,7 @@ class RequestConstraintTestCase(unittest.TestCase): self.assertTrue(new('<', 'z').evaluate('a')) self.assertTrue(new('<', 30).evaluate(4)) self.assertFalse(new('<', 3).evaluate(3)) - self.assertFalse(new('<', 12345).evaluate(12345L)) + self.assertFalse(new('<', 12345).evaluate(12345)) self.assertFalse(new('<', 'a').evaluate('a')) self.assertFalse(new('<', 1.0001).evaluate(1.0002)) self.assertFalse(new('<', 'a').evaluate('b')) @@ -95,7 +95,7 @@ class RequestConstraintTestCase(unittest.TestCase): self.assertTrue(new('<=', 'z').evaluate('a')) self.assertTrue(new('<=', 20).evaluate(3)) self.assertTrue(new('<=', 3).evaluate(3)) - self.assertTrue(new('<=', 12345).evaluate(12345L)) + self.assertTrue(new('<=', 12345).evaluate(12345)) self.assertTrue(new('<=', 'a').evaluate('a')) self.assertFalse(new('<=', 1.0001).evaluate(1.0002)) self.assertFalse(new('<=', 'a').evaluate('b')) diff --git a/awips/test/dafTests/testSatellite.py b/awips/test/dafTests/testSatellite.py index a69cce6..8310ea7 100644 --- a/awips/test/dafTests/testSatellite.py +++ b/awips/test/dafTests/testSatellite.py @@ -89,7 +89,7 @@ class SatelliteTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getAttribute('creatingEntity'), 1000) def testGetDataWithEqualsLong(self): - gridData = self._runConstraintTest('creatingEntity', '=', 1000L) + gridData = self._runConstraintTest('creatingEntity', '=', 1000) for record in gridData: self.assertEqual(record.getAttribute('creatingEntity'), 1000) diff --git a/awips/test/dafTests/testSfcObs.py b/awips/test/dafTests/testSfcObs.py index 7be2d90..171d994 100644 --- a/awips/test/dafTests/testSfcObs.py +++ b/awips/test/dafTests/testSfcObs.py @@ -91,7 +91,7 @@ class SfcObsTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getString('reportType'), '1004') def testGetDataWithEqualsLong(self): - geometryData = self._runConstraintTest('reportType', '=', 1004L) + geometryData = self._runConstraintTest('reportType', '=', 1004) for record in geometryData: self.assertEqual(record.getString('reportType'), '1004') diff --git a/awips/test/dafTests/testWarning.py b/awips/test/dafTests/testWarning.py index 914178e..85e492d 100644 --- a/awips/test/dafTests/testWarning.py +++ b/awips/test/dafTests/testWarning.py @@ -129,7 +129,7 @@ class WarningTestCase(baseDafTestCase.DafTestCase): self.assertEqual(record.getString('etn'), '1000') def testGetDataWithEqualsLong(self): - geometryData = self._runConstraintTest('etn', '=', 1000L) + geometryData = self._runConstraintTest('etn', '=', 1000) for record in geometryData: self.assertEqual(record.getString('etn'), '1000') diff --git a/awips/test/localization/testLocalizationFileManager.py b/awips/test/localization/testLocalizationFileManager.py index 06cd2f0..2c1dcde 100644 --- a/awips/test/localization/testLocalizationFileManager.py +++ b/awips/test/localization/testLocalizationFileManager.py @@ -152,4 +152,4 @@ class LFMTestCase(unittest.TestCase): if __name__ == '__main__': - unittest.main() \ No newline at end of file + unittest.main() diff --git a/awips/test/testQpidTimeToLive.py b/awips/test/testQpidTimeToLive.py index 20e0266..15d4df5 100644 --- a/awips/test/testQpidTimeToLive.py +++ b/awips/test/testQpidTimeToLive.py @@ -40,7 +40,7 @@ class ListenThread(threading.Thread): self.qs.topicSubscribe(self.topicName, self.receivedMessage) def receivedMessage(self, msg): - print "Received message" + print("Received message") self.nMessagesReceived += 1 if self.waitSecond == 0: fmsg = open('/tmp/rawMessage', 'w') @@ -49,21 +49,21 @@ class ListenThread(threading.Thread): while self.waitSecond < TIME_TO_SLEEP and not self.stopped: if self.waitSecond % 60 == 0: - print time.strftime('%H:%M:%S'), "Sleeping and stuck in not so infinite while loop" + print(time.strftime('%H:%M:%S'), "Sleeping and stuck in not so infinite while loop") self.waitSecond += 1 time.sleep(1) - print time.strftime('%H:%M:%S'), "Received", self.nMessagesReceived, "messages" + print(time.strftime('%H:%M:%S'), "Received", self.nMessagesReceived, "messages") def stop(self): - print "Stopping" + print("Stopping") self.stopped = True self.qs.close() def main(): - print "Starting up at", time.strftime('%H:%M:%S') + print("Starting up at", time.strftime('%H:%M:%S')) topic = 'edex.alerts' host = 'localhost' diff --git a/dynamicserialize/DynamicSerializationManager.py b/dynamicserialize/DynamicSerializationManager.py index e0c8dcd..6b56ac0 100644 --- a/dynamicserialize/DynamicSerializationManager.py +++ b/dynamicserialize/DynamicSerializationManager.py @@ -19,7 +19,7 @@ # from thrift.transport import TTransport -import SelfDescribingBinaryProtocol, ThriftSerializationContext +from . import SelfDescribingBinaryProtocol, ThriftSerializationContext class DynamicSerializationManager: @@ -49,4 +49,4 @@ class DynamicSerializationManager: return self.transport.getvalue() def _serialize(self, ctx, obj): - ctx.serializeMessage(obj) \ No newline at end of file + ctx.serializeMessage(obj) diff --git a/dynamicserialize/ThriftSerializationContext.py b/dynamicserialize/ThriftSerializationContext.py index 75324a6..c93e7a6 100644 --- a/dynamicserialize/ThriftSerializationContext.py +++ b/dynamicserialize/ThriftSerializationContext.py @@ -21,6 +21,7 @@ # writeObject(). # Apr 24, 2015 4425 nabowle Add Double support # Oct 17, 2016 5919 njensen Optimized for speed +# Sep 06, 2018 mjames@ucar Python3 compliance # # @@ -29,10 +30,10 @@ import inspect import sys import types import time +import numpy import dynamicserialize from dynamicserialize import dstypes, adapters -import SelfDescribingBinaryProtocol -import numpy +from . import SelfDescribingBinaryProtocol DS_LEN = len('dynamicserialize.dstypes.') @@ -55,17 +56,18 @@ def buildObjMap(module): buildObjMap(dstypes) pythonToThriftMap = { - types.StringType: TType.STRING, - types.IntType: TType.I32, - types.LongType: TType.I64, - types.ListType: TType.LIST, - types.DictionaryType: TType.MAP, + bytes: TType.STRING, + int: TType.I32, + int: TType.I64, + list: TType.LIST, + dict: TType.MAP, type(set([])): TType.SET, - types.FloatType: SelfDescribingBinaryProtocol.FLOAT, + float: SelfDescribingBinaryProtocol.FLOAT, # types.FloatType: TType.DOUBLE, - types.BooleanType: TType.BOOL, - types.InstanceType: TType.STRUCT, - types.NoneType: TType.VOID, + bool: TType.BOOL, + object: TType.STRUCT, + str: TType.STRING, + type(None): TType.VOID, numpy.float32: SelfDescribingBinaryProtocol.FLOAT, numpy.int32: TType.I32, numpy.ndarray: TType.LIST, @@ -142,19 +144,19 @@ class ThriftSerializationContext(object): def deserializeMessage(self): name = self.protocol.readStructBegin() + name = name.decode('cp437') + name = name.replace('_', '.') if name.isdigit(): obj = self._deserializeType(int(name)) return obj - name = name.replace('_', '.') if name in adapters.classAdapterRegistry: return adapters.classAdapterRegistry[name].deserialize(self) elif '$' in name: # it's an inner class, we're going to hope it's an enum, treat it # special fieldName, fieldType, fieldId = self.protocol.readFieldBegin() - if fieldName != '__enumValue__': - raise dynamiceserialize.SerializationException( - "Expected to find enum payload. Found: " + fieldName) + if fieldName.decode('utf8') != '__enumValue__': + raise dynamicserialize.SerializationException("Expected to find enum payload. Found: " + fieldName) obj = self.protocol.readString() self.protocol.readFieldEnd() return obj @@ -181,7 +183,8 @@ class ThriftSerializationContext(object): return False elif fieldType != TType.VOID: result = self._deserializeType(fieldType) - lookingFor = "set" + fieldName[0].upper() + fieldName[1:] + fn_str = bytes.decode(fieldName) + lookingFor = "set" + fn_str[0].upper() + fn_str[1:] try: setMethod = getattr(obj, lookingFor) @@ -199,7 +202,7 @@ class ThriftSerializationContext(object): if size: if listType not in primitiveSupport: m = self.typeDeserializationMethod[listType] - result = [m() for n in xrange(size)] + result = [m() for n in range(size)] else: result = self.listDeserializationMethod[listType](size) self.protocol.readListEnd() @@ -208,7 +211,7 @@ class ThriftSerializationContext(object): def _deserializeMap(self): keyType, valueType, size = self.protocol.readMapBegin() result = {} - for n in xrange(size): + for n in range(size): # can't go off the type, due to java generics limitations dynamic serialize is # serializing keys and values as void key = self.typeDeserializationMethod[TType.STRUCT]() @@ -220,7 +223,7 @@ class ThriftSerializationContext(object): def _deserializeSet(self): setType, setSize = self.protocol.readSetBegin() result = set([]) - for n in xrange(setSize): + for n in range(setSize): result.add(self.typeDeserializationMethod[TType.STRUCT]()) self.protocol.readSetEnd() return result @@ -230,7 +233,7 @@ class ThriftSerializationContext(object): if pyt in pythonToThriftMap: return pythonToThriftMap[pyt] elif pyt.__module__[:DS_LEN - 1] == ('dynamicserialize.dstypes'): - return pythonToThriftMap[types.InstanceType] + return pythonToThriftMap[object] else: raise dynamicserialize.SerializationException( "Don't know how to serialize object of type: " + str(pyt)) @@ -253,11 +256,14 @@ class ThriftSerializationContext(object): self.protocol.writeStructBegin(fqn) methods = inspect.getmembers(obj, inspect.ismethod) fid = 1 + #print(methods); for m in methods: methodName = m[0] if methodName.startswith('get'): fieldname = methodName[3].lower() + methodName[4:] val = m[1]() + #print(val); + dir(val); ft = self._lookupType(val) if ft == TType.STRUCT: fc = val.__module__[DS_LEN:] diff --git a/dynamicserialize/__init__.py b/dynamicserialize/__init__.py index 2129c0d..9ed1755 100644 --- a/dynamicserialize/__init__.py +++ b/dynamicserialize/__init__.py @@ -18,8 +18,8 @@ __all__ = [ ] -import dstypes, adapters -import DynamicSerializationManager +from . import dstypes, adapters +from . import DynamicSerializationManager class SerializationException(Exception): @@ -38,4 +38,4 @@ def serialize(obj): def deserialize(bytes): dsm = DynamicSerializationManager.DynamicSerializationManager() - return dsm.deserializeBytes(bytes) \ No newline at end of file + return dsm.deserializeBytes(bytes) diff --git a/dynamicserialize/adapters/CommutativeTimestampAdapter.py b/dynamicserialize/adapters/CommutativeTimestampAdapter.py index 4a72214..b24e23b 100644 --- a/dynamicserialize/adapters/CommutativeTimestampAdapter.py +++ b/dynamicserialize/adapters/CommutativeTimestampAdapter.py @@ -26,4 +26,4 @@ def serialize(context, date): def deserialize(context): result = CommutativeTimestamp() result.setTime(context.readI64()) - return result \ No newline at end of file + return result diff --git a/dynamicserialize/adapters/DatabaseIDAdapter.py b/dynamicserialize/adapters/DatabaseIDAdapter.py index 9380ec8..18f5b6a 100644 --- a/dynamicserialize/adapters/DatabaseIDAdapter.py +++ b/dynamicserialize/adapters/DatabaseIDAdapter.py @@ -24,4 +24,4 @@ def serialize(context, dbId): def deserialize(context): result = DatabaseID(context.readString()) - return result \ No newline at end of file + return result diff --git a/dynamicserialize/adapters/DateAdapter.py b/dynamicserialize/adapters/DateAdapter.py index 6a15a02..51dcf03 100644 --- a/dynamicserialize/adapters/DateAdapter.py +++ b/dynamicserialize/adapters/DateAdapter.py @@ -25,4 +25,4 @@ def serialize(context, date): def deserialize(context): result = Date() result.setTime(context.readI64()) - return result \ No newline at end of file + return result diff --git a/dynamicserialize/adapters/EnumSetAdapter.py b/dynamicserialize/adapters/EnumSetAdapter.py index 9291b64..ac0a6af 100644 --- a/dynamicserialize/adapters/EnumSetAdapter.py +++ b/dynamicserialize/adapters/EnumSetAdapter.py @@ -35,6 +35,6 @@ def deserialize(context): setSize = context.readI32() enumClassName = context.readString() valList = [] - for i in xrange(setSize): + for i in range(setSize): valList.append(context.readString()) return EnumSet(enumClassName, valList) diff --git a/dynamicserialize/adapters/FormattedDateAdapter.py b/dynamicserialize/adapters/FormattedDateAdapter.py index ff1af26..99898d1 100644 --- a/dynamicserialize/adapters/FormattedDateAdapter.py +++ b/dynamicserialize/adapters/FormattedDateAdapter.py @@ -26,4 +26,4 @@ def serialize(context, date): def deserialize(context): result = FormattedDate() result.setTime(context.readI64()) - return result \ No newline at end of file + return result diff --git a/dynamicserialize/adapters/GeomDataRespAdapter.py b/dynamicserialize/adapters/GeomDataRespAdapter.py index 6ce1f23..004460e 100644 --- a/dynamicserialize/adapters/GeomDataRespAdapter.py +++ b/dynamicserialize/adapters/GeomDataRespAdapter.py @@ -59,13 +59,13 @@ def serialize(context, resp): def deserialize(context): size = context.readI32() wkbs = [] - for i in xrange(size): + for i in range(size): wkb = context.readBinary() wkbs.append(wkb) geoData = [] size = context.readI32() - for i in xrange(size): + for i in range(size): data = GeometryResponseData() # wkb index wkbIndex = context.readI32() @@ -83,7 +83,7 @@ def deserialize(context): # parameters paramSize = context.readI32() paramMap = {} - for k in xrange(paramSize): + for k in range(paramSize): paramName = context.readString() value = context.readObject() tName = context.readString() diff --git a/dynamicserialize/adapters/GridDataHistoryAdapter.py b/dynamicserialize/adapters/GridDataHistoryAdapter.py index 14e59ca..873ff5b 100644 --- a/dynamicserialize/adapters/GridDataHistoryAdapter.py +++ b/dynamicserialize/adapters/GridDataHistoryAdapter.py @@ -27,4 +27,4 @@ def serialize(context, history): def deserialize(context): result = GridDataHistory(context.readString()) - return result \ No newline at end of file + return result diff --git a/dynamicserialize/adapters/LockTableAdapter.py b/dynamicserialize/adapters/LockTableAdapter.py index 64b899e..8b777f2 100644 --- a/dynamicserialize/adapters/LockTableAdapter.py +++ b/dynamicserialize/adapters/LockTableAdapter.py @@ -29,7 +29,7 @@ def serialize(context, lockTable): for lock in locks: wsIdString = str(lock.getWsId()) - if wsIds.has_key(wsIdString): + if wsIdString in wsIds: lockWsIdIndex.append(wsIds[wsIdString]) else: lockWsIdIndex.append(index) @@ -52,12 +52,12 @@ def deserialize(context): parmId = context.readObject() numWsIds = context.readI32() wsIds = [] - for x in xrange(numWsIds): + for x in range(numWsIds): wsIds.append(context.readObject()) numLocks = context.readI32() locks = [] - for x in xrange(numLocks): + for x in range(numLocks): startTime = context.readI64() endTime = context.readI64() wsId = wsIds[context.readI32()] @@ -69,4 +69,4 @@ def deserialize(context): lockTable.setWsId(wsIds[0]) lockTable.setLocks(locks) - return lockTable \ No newline at end of file + return lockTable diff --git a/dynamicserialize/adapters/ParmIDAdapter.py b/dynamicserialize/adapters/ParmIDAdapter.py index 75c4936..7f8eb2e 100644 --- a/dynamicserialize/adapters/ParmIDAdapter.py +++ b/dynamicserialize/adapters/ParmIDAdapter.py @@ -24,4 +24,4 @@ def serialize(context, parmId): def deserialize(context): result = ParmID(context.readString()) - return result \ No newline at end of file + return result diff --git a/dynamicserialize/adapters/TimeConstraintsAdapter.py b/dynamicserialize/adapters/TimeConstraintsAdapter.py index 6f84694..2d8d3ad 100644 --- a/dynamicserialize/adapters/TimeConstraintsAdapter.py +++ b/dynamicserialize/adapters/TimeConstraintsAdapter.py @@ -26,4 +26,4 @@ def serialize(context, timeConstraints): def deserialize(context): result = TimeConstraints(context.readI32(), context.readI32(), context.readI32()) - return result \ No newline at end of file + return result diff --git a/dynamicserialize/adapters/TimestampAdapter.py b/dynamicserialize/adapters/TimestampAdapter.py index 997ab86..941f986 100644 --- a/dynamicserialize/adapters/TimestampAdapter.py +++ b/dynamicserialize/adapters/TimestampAdapter.py @@ -24,4 +24,4 @@ def serialize(context, timestamp): def deserialize(context): result = Timestamp(context.readI64()) - return result \ No newline at end of file + return result diff --git a/dynamicserialize/adapters/WsIdAdapter.py b/dynamicserialize/adapters/WsIdAdapter.py index 72f5da4..7e8cc47 100644 --- a/dynamicserialize/adapters/WsIdAdapter.py +++ b/dynamicserialize/adapters/WsIdAdapter.py @@ -35,7 +35,7 @@ def deserialize(context): wsId.setUserName(wsIdParts[1]) wsId.setProgName(wsIdParts[2]) wsId.setPid(wsIdParts[3]) - wsId.setThreadId(long(wsIdParts[4])) + wsId.setThreadId(int(wsIdParts[4])) return wsId diff --git a/dynamicserialize/adapters/__init__.py b/dynamicserialize/adapters/__init__.py index 92907cf..205b474 100644 --- a/dynamicserialize/adapters/__init__.py +++ b/dynamicserialize/adapters/__init__.py @@ -76,10 +76,10 @@ def registerAdapters(package, modules): if not package.endswith('.'): package += '.' for x in modules: - exec 'import ' + package + x + exec('import ' + package + x) m = sys.modules[package + 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 diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py index 22a3c96..c8bcc21 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py @@ -11,12 +11,11 @@ # ## -import ActiveTableKey import abc +from six import with_metaclass +from . import ActiveTableKey -class ActiveTableRecord(object): - __metaclass__ = abc.ABCMeta - +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/activetable/OperationalActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py index f2fe558..91efa8e 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py @@ -9,9 +9,9 @@ # ## -import ActiveTableRecord +from . import ActiveTableRecord -class OperationalActiveTableRecord(ActiveTableRecord.ActiveTableRecord): +class OperationalActiveTableRecord(ActiveTableRecord): def __init__(self): super(OperationalActiveTableRecord, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py index 2dd43d6..710d717 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py @@ -9,9 +9,9 @@ # ## -import ActiveTableRecord +from . import ActiveTableRecord -class PracticeActiveTableRecord(ActiveTableRecord.ActiveTableRecord): +class PracticeActiveTableRecord(ActiveTableRecord): def __init__(self): super(PracticeActiveTableRecord, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py index 13f654b..912c03c 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py @@ -24,20 +24,20 @@ __all__ = [ '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 +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 diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/request/__init__.py index a153aed..5ce163c 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/request/__init__.py @@ -10,8 +10,8 @@ __all__ = [ 'SendActiveTableRequest' ] -from ClearPracticeVTECTableRequest import ClearPracticeVTECTableRequest -from MergeActiveTableRequest import MergeActiveTableRequest -from RetrieveRemoteActiveTableRequest import RetrieveRemoteActiveTableRequest -from SendActiveTableRequest import SendActiveTableRequest +from .ClearPracticeVTECTableRequest import ClearPracticeVTECTableRequest +from .MergeActiveTableRequest import MergeActiveTableRequest +from .RetrieveRemoteActiveTableRequest import RetrieveRemoteActiveTableRequest +from .SendActiveTableRequest import SendActiveTableRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/response/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/response/__init__.py index 8e282df..d6f66ca 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/response/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/response/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'ActiveTableSharingResponse' ] -from ActiveTableSharingResponse import ActiveTableSharingResponse +from .ActiveTableSharingResponse import ActiveTableSharingResponse diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/AlertVizRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/AlertVizRequest.py index 2f34ed1..4ed4aae 100755 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/AlertVizRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/AlertVizRequest.py @@ -57,7 +57,7 @@ class AlertVizRequest(object): def setFilters(self, filters): if filters is None: self.filters = {} - elif not(filters.has_key(None) or filters.values().count(None)>0 or filters.has_key('') or filters.values().count('')>0): + elif not(None in filters or filters.values().count(None)>0 or '' in filters or filters.values().count('')>0): self.filters = filters else: raise ValueError('Filters must not contain None or empty keys or values: %s' % filters) diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/__init__.py index 623f23d..9f656ff 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'AlertVizRequest' ] -from AlertVizRequest import AlertVizRequest +from .AlertVizRequest import AlertVizRequest 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 f908104..d0b400a 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/AbstractFailedResponse.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/AbstractFailedResponse.py @@ -3,12 +3,11 @@ # File auto-generated against equivalent DynamicSerialize Java class +from six import with_metaclass import abc -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/auth/resp/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/__init__.py index d50c784..0b3f5f8 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/__init__.py @@ -10,8 +10,8 @@ __all__ = [ 'UserNotAuthorized' ] -from AbstractFailedResponse import AbstractFailedResponse -from AuthServerErrorResponse import AuthServerErrorResponse -from SuccessfulExecution import SuccessfulExecution -from UserNotAuthorized import UserNotAuthorized +from .AbstractFailedResponse import AbstractFailedResponse +from .AuthServerErrorResponse import AuthServerErrorResponse +from .SuccessfulExecution import SuccessfulExecution +from .UserNotAuthorized import UserNotAuthorized diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/__init__.py index cd7b045..695d2f9 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/__init__.py @@ -8,5 +8,5 @@ __all__ = [ 'UserId' ] -from User import User -from UserId import UserId +from .User import User +from .UserId import UserId diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py index 0bf4346..daa6af4 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py @@ -40,10 +40,10 @@ class DefaultDataRequest(IDataRequest): del self.identifiers[key] def setParameters(self, *params): - self.parameters = map(str, params) + self.parameters = list(map(str, params)) def setLevels(self, *levels): - self.levels = map(self.__makeLevel, levels) + self.levels = list(map(self.__makeLevel, levels)) def __makeLevel(self, level): if type(level) is Level: @@ -57,7 +57,7 @@ class DefaultDataRequest(IDataRequest): self.envelope = Envelope(env.envelope) def setLocationNames(self, *locationNames): - self.locationNames = map(str, locationNames) + self.locationNames = list(map(str, locationNames)) def getDatatype(self): return self.datatype diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/__init__.py index dad522e..c2f266e 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/__init__.py @@ -8,5 +8,5 @@ __all__ = [ 'DefaultNotificationFilter' ] -from DefaultDataRequest import DefaultDataRequest -from DefaultNotificationFilter import DefaultNotificationFilter \ No newline at end of file +from .DefaultDataRequest import DefaultDataRequest +from .DefaultNotificationFilter import DefaultNotificationFilter 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 12fa14a..d1975df 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractDataAccessRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractDataAccessRequest.py @@ -12,12 +12,11 @@ # # +from six import with_metaclass import abc -class AbstractDataAccessRequest(object): - __metaclass__ = abc.ABCMeta - +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 12c0eef..0fcb23a 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractIdentifierRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/AbstractIdentifierRequest.py @@ -14,11 +14,10 @@ # # +from six import with_metaclass import abc -class AbstractIdentifierRequest(object): - __metaclass__ = abc.ABCMeta - +class AbstractIdentifierRequest(with_metaclass(abc.ABCMeta, object)): def __init__(self): self.request = None diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/GetGridDataRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/GetGridDataRequest.py index 4d01940..737290b 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/GetGridDataRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/GetGridDataRequest.py @@ -41,4 +41,4 @@ class GetGridDataRequest(AbstractDataAccessRequest): return self.includeLatLonData def setIncludeLatLonData(self, includeLatLonData): - self.includeLatLonData = includeLatLonData; \ No newline at end of file + self.includeLatLonData = includeLatLonData; diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/__init__.py index 9fe5d6c..b061317 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/__init__.py @@ -20,18 +20,18 @@ __all__ = [ 'GetSupportedDatatypesRequest' ] -from AbstractDataAccessRequest import AbstractDataAccessRequest -from AbstractIdentifierRequest import AbstractIdentifierRequest -from GetAvailableLevelsRequest import GetAvailableLevelsRequest -from GetAvailableLocationNamesRequest import GetAvailableLocationNamesRequest -from GetAvailableParametersRequest import GetAvailableParametersRequest -from GetAvailableTimesRequest import GetAvailableTimesRequest -from GetGeometryDataRequest import GetGeometryDataRequest -from GetGridDataRequest import GetGridDataRequest -from GetGridLatLonRequest import GetGridLatLonRequest -from GetIdentifierValuesRequest import GetIdentifierValuesRequest -from GetNotificationFilterRequest import GetNotificationFilterRequest -from GetOptionalIdentifiersRequest import GetOptionalIdentifiersRequest -from GetRequiredIdentifiersRequest import GetRequiredIdentifiersRequest -from GetSupportedDatatypesRequest import GetSupportedDatatypesRequest +from .AbstractDataAccessRequest import AbstractDataAccessRequest +from .AbstractIdentifierRequest import AbstractIdentifierRequest +from .GetAvailableLevelsRequest import GetAvailableLevelsRequest +from .GetAvailableLocationNamesRequest import GetAvailableLocationNamesRequest +from .GetAvailableParametersRequest import GetAvailableParametersRequest +from .GetAvailableTimesRequest import GetAvailableTimesRequest +from .GetGeometryDataRequest import GetGeometryDataRequest +from .GetGridDataRequest import GetGridDataRequest +from .GetGridLatLonRequest import GetGridLatLonRequest +from .GetIdentifierValuesRequest import GetIdentifierValuesRequest +from .GetNotificationFilterRequest import GetNotificationFilterRequest +from .GetOptionalIdentifiersRequest import GetOptionalIdentifiersRequest +from .GetRequiredIdentifiersRequest import GetRequiredIdentifiersRequest +from .GetSupportedDatatypesRequest import GetSupportedDatatypesRequest 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 84eaeca..15275db 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/response/AbstractResponseData.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/response/AbstractResponseData.py @@ -4,11 +4,9 @@ # 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/dataaccess/response/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/response/__init__.py index 1aa438f..da48e4f 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/response/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/response/__init__.py @@ -13,11 +13,11 @@ __all__ = [ 'GridResponseData' ] -from AbstractResponseData import AbstractResponseData -from GeometryResponseData import GeometryResponseData -from GetGeometryDataResponse import GetGeometryDataResponse -from GetGridDataResponse import GetGridDataResponse -from GetGridLatLonResponse import GetGridLatLonResponse -from GetNotificationFilterResponse import GetNotificationFilterResponse -from GridResponseData import GridResponseData +from .AbstractResponseData import AbstractResponseData +from .GeometryResponseData import GeometryResponseData +from .GetGeometryDataResponse import GetGeometryDataResponse +from .GetGridDataResponse import GetGridDataResponse +from .GetGridLatLonResponse import GetGridLatLonResponse +from .GetNotificationFilterResponse import GetNotificationFilterResponse +from .GridResponseData import GridResponseData diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/events/hazards/requests/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/events/hazards/requests/__init__.py index 9d591bf..bfb6f0b 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/events/hazards/requests/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/events/hazards/requests/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'RegionLookupRequest' ] -from RegionLookupRequest import RegionLookupRequest +from .RegionLookupRequest import RegionLookupRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/__init__.py index 0827d48..8786885 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/__init__.py @@ -22,5 +22,5 @@ __all__ = [ 'GridDataHistory' ] -from GridDataHistory import GridDataHistory +from .GridDataHistory import GridDataHistory diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/config/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/config/__init__.py index 60ccea2..9a9d9c7 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/config/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/config/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'ProjectionData' ] -from ProjectionData import ProjectionData +from .ProjectionData import ProjectionData diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/__init__.py index 873105b..163a011 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/__init__.py @@ -12,10 +12,10 @@ __all__ = [ 'TimeConstraints' ] -from DatabaseID import DatabaseID -from GFERecord import GFERecord -from GridLocation import GridLocation -from GridParmInfo import GridParmInfo -from ParmID import ParmID -from TimeConstraints import TimeConstraints +from .DatabaseID import DatabaseID +from .GFERecord import GFERecord +from .GridLocation import GridLocation +from .GridParmInfo import GridParmInfo +from .ParmID import ParmID +from .TimeConstraints import TimeConstraints diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/discrete/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/discrete/__init__.py index 55c7a4b..4f4c060 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/discrete/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/discrete/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'DiscreteKey' ] -from DiscreteKey import DiscreteKey +from .DiscreteKey import DiscreteKey diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/grid/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/grid/__init__.py index 0efdd01..2fd2408 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/grid/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/grid/__init__.py @@ -8,6 +8,6 @@ __all__ = [ 'Grid2DFloat' ] -from Grid2DByte import Grid2DByte -from Grid2DFloat import Grid2DFloat +from .Grid2DByte import Grid2DByte +from .Grid2DFloat import Grid2DFloat 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 0d57eb9..ffbfc74 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 @@ -4,11 +4,9 @@ # 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 0e2c847..fdcc3ef 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 @@ -4,13 +4,11 @@ # File auto-generated against equivalent DynamicSerialize Java class import abc - +from six import with_metaclass from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.server.request import GetGridRequest -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/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py index f4dc124..9e97123 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py @@ -38,31 +38,31 @@ __all__ = [ 'SmartInitRequest' ] -from AbstractGfeRequest import AbstractGfeRequest -from CommitGridsRequest import CommitGridsRequest -from ConfigureTextProductsRequest import ConfigureTextProductsRequest -from ExecuteIfpNetCDFGridRequest import ExecuteIfpNetCDFGridRequest -from ExecuteIscMosaicRequest import ExecuteIscMosaicRequest -from ExportGridsRequest import ExportGridsRequest -from GetASCIIGridsRequest import GetASCIIGridsRequest -from GetGridDataRequest import GetGridDataRequest -from GetGridInventoryRequest import GetGridInventoryRequest -from GetLatestDbTimeRequest import GetLatestDbTimeRequest -from GetLatestModelDbIdRequest import GetLatestModelDbIdRequest -from GetLockTablesRequest import GetLockTablesRequest -from GetOfficialDbNameRequest import GetOfficialDbNameRequest -from GetParmListRequest import GetParmListRequest -from GetSelectTimeRangeRequest import GetSelectTimeRangeRequest -from GetSingletonDbIdsRequest import GetSingletonDbIdsRequest -from GetSiteTimeZoneInfoRequest import GetSiteTimeZoneInfoRequest -from GfeClientRequest import GfeClientRequest -from GridLocRequest import GridLocRequest -from IscDataRecRequest import IscDataRecRequest -from LockChangeRequest import LockChangeRequest -from ProcessReceivedConfRequest import ProcessReceivedConfRequest -from ProcessReceivedDigitalDataRequest import ProcessReceivedDigitalDataRequest -from PurgeGfeGridsRequest import PurgeGfeGridsRequest -from SaveASCIIGridsRequest import SaveASCIIGridsRequest -from SmartInitRequest import SmartInitRequest -from RsyncGridsToCWFRequest import RsyncGridsToCWFRequest +from .AbstractGfeRequest import AbstractGfeRequest +from .CommitGridsRequest import CommitGridsRequest +from .ConfigureTextProductsRequest import ConfigureTextProductsRequest +from .ExecuteIfpNetCDFGridRequest import ExecuteIfpNetCDFGridRequest +from .ExecuteIscMosaicRequest import ExecuteIscMosaicRequest +from .ExportGridsRequest import ExportGridsRequest +from .GetASCIIGridsRequest import GetASCIIGridsRequest +from .GetGridDataRequest import GetGridDataRequest +from .GetGridInventoryRequest import GetGridInventoryRequest +from .GetLatestDbTimeRequest import GetLatestDbTimeRequest +from .GetLatestModelDbIdRequest import GetLatestModelDbIdRequest +from .GetLockTablesRequest import GetLockTablesRequest +from .GetOfficialDbNameRequest import GetOfficialDbNameRequest +from .GetParmListRequest import GetParmListRequest +from .GetSelectTimeRangeRequest import GetSelectTimeRangeRequest +from .GetSingletonDbIdsRequest import GetSingletonDbIdsRequest +from .GetSiteTimeZoneInfoRequest import GetSiteTimeZoneInfoRequest +from .GfeClientRequest import GfeClientRequest +from .GridLocRequest import GridLocRequest +from .IscDataRecRequest import IscDataRecRequest +from .LockChangeRequest import LockChangeRequest +from .ProcessReceivedConfRequest import ProcessReceivedConfRequest +from .ProcessReceivedDigitalDataRequest import ProcessReceivedDigitalDataRequest +from .PurgeGfeGridsRequest import PurgeGfeGridsRequest +from .SaveASCIIGridsRequest import SaveASCIIGridsRequest +from .SmartInitRequest import SmartInitRequest +from .RsyncGridsToCWFRequest import RsyncGridsToCWFRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/lock/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/lock/__init__.py index 17334d4..ab7f389 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/lock/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/lock/__init__.py @@ -8,6 +8,6 @@ __all__ = [ 'LockTable' ] -from Lock import Lock -from LockTable import LockTable +from .Lock import Lock +from .LockTable import LockTable diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/message/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/message/__init__.py index f0637b7..231e9c8 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/message/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/message/__init__.py @@ -8,6 +8,6 @@ __all__ = [ 'ServerResponse' ] -from ServerMsg import ServerMsg -from ServerResponse import ServerResponse +from .ServerMsg import ServerMsg +from .ServerResponse import ServerResponse diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/CombinationsFileChangedNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/CombinationsFileChangedNotification.py index d96dae3..1bc0b53 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/CombinationsFileChangedNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/CombinationsFileChangedNotification.py @@ -9,7 +9,7 @@ # ## -import GfeNotification +from . import GfeNotification class CombinationsFileChangedNotification(GfeNotification.GfeNotification): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/DBInvChangeNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/DBInvChangeNotification.py index b84b58a..ef020d8 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/DBInvChangeNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/DBInvChangeNotification.py @@ -11,7 +11,7 @@ # ## -import GfeNotification +from . import GfeNotification class DBInvChangeNotification(GfeNotification.GfeNotification): 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 4fa69a5..d963eea 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 @@ -8,10 +8,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/server/notify/GridHistoryUpdateNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridHistoryUpdateNotification.py index b6de799..8cad647 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridHistoryUpdateNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridHistoryUpdateNotification.py @@ -9,9 +9,9 @@ # ## -import GfeNotification +from . import GfeNotification -class GridHistoryUpdateNotification(GfeNotification.GfeNotification): +class GridHistoryUpdateNotification(GfeNotification): def __init__(self): super(GridHistoryUpdateNotification, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridUpdateNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridUpdateNotification.py index be3efa0..9e70270 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridUpdateNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/GridUpdateNotification.py @@ -10,9 +10,9 @@ # ## -import GfeNotification +from . import GfeNotification -class GridUpdateNotification(GfeNotification.GfeNotification): +class GridUpdateNotification(GfeNotification): def __init__(self): super(GridUpdateNotification, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/LockNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/LockNotification.py index b6b9f7e..f4782f1 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/LockNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/LockNotification.py @@ -10,9 +10,9 @@ # ## -import GfeNotification +from . import GfeNotification -class LockNotification(GfeNotification.GfeNotification): +class LockNotification(GfeNotification): def __init__(self): super(LockNotification, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/ServiceBackupJobStatusNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/ServiceBackupJobStatusNotification.py index 656f882..7feda5f 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/ServiceBackupJobStatusNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/ServiceBackupJobStatusNotification.py @@ -9,9 +9,9 @@ # ## -import GfeNotification +from . import GfeNotification -class ServiceBackupJobStatusNotification(GfeNotification.GfeNotification): +class ServiceBackupJobStatusNotification(GfeNotification): def __init__(self): super(ServiceBackupJobStatusNotification, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/UserMessageNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/UserMessageNotification.py index eb33bc7..2f05bf4 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/UserMessageNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/notify/UserMessageNotification.py @@ -9,9 +9,9 @@ # ## -import GfeNotification +from . import GfeNotification -class UserMessageNotification(GfeNotification.GfeNotification): +class UserMessageNotification(GfeNotification): def __init__(self): super(UserMessageNotification, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/request/__init__.py index c2b1580..314eab8 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/request/__init__.py @@ -10,8 +10,8 @@ __all__ = [ 'LockTableRequest' ] -from CommitGridRequest import CommitGridRequest -from GetGridRequest import GetGridRequest -from LockRequest import LockRequest -from LockTableRequest import LockTableRequest +from .CommitGridRequest import CommitGridRequest +from .GetGridRequest import GetGridRequest +from .LockRequest import LockRequest +from .LockTableRequest import LockTableRequest 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 fda00c2..9949e6b 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 @@ -2,11 +2,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 @@ -33,4 +31,4 @@ class AbstractGridSlice(object): return self.gridDataHistory def setGridDataHistory(self, gridDataHistory): - self.gridDataHistory = gridDataHistory \ No newline at end of file + self.gridDataHistory = gridDataHistory diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/__init__.py index 2d9f313..c382ee3 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/__init__.py @@ -11,9 +11,9 @@ __all__ = [ 'WeatherGridSlice' ] -from AbstractGridSlice import AbstractGridSlice -from DiscreteGridSlice import DiscreteGridSlice -from ScalarGridSlice import ScalarGridSlice -from VectorGridSlice import VectorGridSlice -from WeatherGridSlice import WeatherGridSlice +from .AbstractGridSlice import AbstractGridSlice +from .DiscreteGridSlice import DiscreteGridSlice +from .ScalarGridSlice import ScalarGridSlice +from .VectorGridSlice import VectorGridSlice +from .WeatherGridSlice import WeatherGridSlice diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/svcbu/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/svcbu/__init__.py index 31bc152..06b1aa5 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/svcbu/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/svcbu/__init__.py @@ -13,4 +13,4 @@ __all__ = [ 'JobProgress' ] -from JobProgress import JobProgress +from .JobProgress import JobProgress diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/weather/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/weather/__init__.py index 0ff209a..50fd302 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/weather/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/weather/__init__.py @@ -8,6 +8,6 @@ __all__ = [ 'WeatherSubKey' ] -from WeatherKey import WeatherKey -from WeatherSubKey import WeatherSubKey +from .WeatherKey import WeatherKey +from .WeatherSubKey import WeatherSubKey diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grid/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grid/request/__init__.py index 9fa2071..138150e 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grid/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grid/request/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'DeleteAllGridDataRequest' ] -from DeleteAllGridDataRequest import DeleteAllGridDataRequest +from .DeleteAllGridDataRequest import DeleteAllGridDataRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py index 5067604..47be90c 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py @@ -28,7 +28,7 @@ INVALID_VALUE = numpy.float64(-999999) class Level(object): def __init__(self, levelString=None): - self.id = 0L + self.id = 0 self.identifier = None self.masterLevel = None self.levelonevalue = INVALID_VALUE diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/__init__.py index eeb61b8..c7c1a51 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/__init__.py @@ -8,6 +8,6 @@ __all__ = [ 'MasterLevel' ] -from Level import Level -from MasterLevel import MasterLevel +from .Level import Level +from .MasterLevel import MasterLevel diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/message/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/message/__init__.py index 8bd0a20..4d54b36 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/message/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/message/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'DataURINotificationMessage' ] -from DataURINotificationMessage import DataURINotificationMessage +from .DataURINotificationMessage import DataURINotificationMessage diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/radar/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/radar/request/__init__.py index c7c7066..0469c79 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/radar/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/radar/request/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'GetRadarDataRecordRequest' ] -from GetRadarDataRecordRequest import GetRadarDataRecordRequest +from .GetRadarDataRecordRequest import GetRadarDataRecordRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/radar/response/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/radar/response/__init__.py index 02f70a5..bdc2315 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/radar/response/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/radar/response/__init__.py @@ -8,6 +8,6 @@ __all__ = [ 'RadarDataRecord' ] -from GetRadarDataRecordResponse import GetRadarDataRecordResponse -from RadarDataRecord import RadarDataRecord +from .GetRadarDataRecordResponse import GetRadarDataRecordResponse +from .RadarDataRecord import RadarDataRecord diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/dbsrv/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/dbsrv/__init__.py index c211070..bf32469 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/dbsrv/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/dbsrv/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'TextDBRequest' ] -from TextDBRequest import TextDBRequest +from .TextDBRequest import TextDBRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/__init__.py index 20b9b71..3ad49b8 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'SubscriptionRequest' ] -from SubscriptionRequest import SubscriptionRequest +from .SubscriptionRequest import SubscriptionRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/RequestConstraint.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/RequestConstraint.py index a8d17df..0cc8ac8 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/RequestConstraint.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/RequestConstraint.py @@ -13,7 +13,7 @@ # import re -from ...time import DataTime +from dynamicserialize.dstypes.com.raytheon.uf.common.time import DataTime class RequestConstraint(object): @@ -210,7 +210,7 @@ class RequestConstraint(object): @staticmethod def _stringify(value): - if type(value) in {str, int, long, bool, float, unicode}: + if type(value) in {str, int, int, bool, float, unicode}: return str(value) else: # Collections are not allowed; they are handled separately. @@ -263,7 +263,7 @@ class RequestConstraint(object): """Build a new RequestConstraint.""" try: constraintType = cls.CONSTRAINT_MAP[operator.upper()] - except KeyError, AttributeError: + except KeyError as AttributeError: errmsg = '{} is not a valid operator. Valid operators are: {}' validOperators = list(sorted(cls.CONSTRAINT_MAP.keys())) raise ValueError(errmsg.format(operator, validOperators)) diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/__init__.py index fdd0a6d..6c9c43d 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'RequestConstraint' ] -from RequestConstraint import RequestConstraint +from .RequestConstraint import RequestConstraint diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/__init__.py index 1a02d76..e03b446 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/__init__.py @@ -23,6 +23,6 @@ __all__ = [ 'StorageStatus' ] -from Request import Request -from StorageProperties import StorageProperties -from StorageStatus import StorageStatus +from .Request import Request +from .StorageProperties import StorageProperties +from .StorageStatus import StorageStatus diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/__init__.py index cbfc808..bc4a9fd 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/__init__.py @@ -26,11 +26,11 @@ __all__ = [ 'StringDataRecord' ] -from ByteDataRecord import ByteDataRecord -from DoubleDataRecord import DoubleDataRecord -from FloatDataRecord import FloatDataRecord -from IntegerDataRecord import IntegerDataRecord -from LongDataRecord import LongDataRecord -from ShortDataRecord import ShortDataRecord -from StringDataRecord import StringDataRecord +from .ByteDataRecord import ByteDataRecord +from .DoubleDataRecord import DoubleDataRecord +from .FloatDataRecord import FloatDataRecord +from .IntegerDataRecord import IntegerDataRecord +from .LongDataRecord import LongDataRecord +from .ShortDataRecord import ShortDataRecord +from .StringDataRecord import StringDataRecord diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/LocalizationLevel.py b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/LocalizationLevel.py index 0c43763..ab130b1 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/LocalizationLevel.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/LocalizationLevel.py @@ -26,7 +26,7 @@ knownLevels = {"BASE": {"text" : "BASE", class LocalizationLevel(object): def __init__(self, level, order=750, systemLevel=False): - if knownLevels.has_key(level.upper()): + if level.upper() in knownLevels: self.text = level.upper() self.order = knownLevels[self.text]["order"] self.systemLevel = knownLevels[self.text]["systemLevel"] diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py index 2065c7a..85915e0 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py @@ -11,7 +11,7 @@ __all__ = [ 'LocalizationType' ] -from LocalizationContext import LocalizationContext -from LocalizationLevel import LocalizationLevel -from LocalizationType import LocalizationType +from .LocalizationContext import LocalizationContext +from .LocalizationLevel import LocalizationLevel +from .LocalizationType import LocalizationType diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/msgs/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/msgs/__init__.py index ff6ec26..a51bebb 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/msgs/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/msgs/__init__.py @@ -14,12 +14,12 @@ __all__ = [ 'UtilityResponseMessage' ] -from DeleteUtilityCommand import DeleteUtilityCommand -from DeleteUtilityResponse import DeleteUtilityResponse -from ListResponseEntry import ListResponseEntry -from ListUtilityCommand import ListUtilityCommand -from ListUtilityResponse import ListUtilityResponse -from PrivilegedUtilityRequestMessage import PrivilegedUtilityRequestMessage -from UtilityRequestMessage import UtilityRequestMessage -from UtilityResponseMessage import UtilityResponseMessage +from .DeleteUtilityCommand import DeleteUtilityCommand +from .DeleteUtilityResponse import DeleteUtilityResponse +from .ListResponseEntry import ListResponseEntry +from .ListUtilityCommand import ListUtilityCommand +from .ListUtilityResponse import ListUtilityResponse +from .PrivilegedUtilityRequestMessage import PrivilegedUtilityRequestMessage +from .UtilityRequestMessage import UtilityRequestMessage +from .UtilityResponseMessage import UtilityResponseMessage 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 83322a2..08566d1 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/AbstractLocalizationStreamRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/AbstractLocalizationStreamRequest.py @@ -3,13 +3,12 @@ # File auto-generated against equivalent DynamicSerialize Java class +from six import with_metaclass import abc import os from dynamicserialize.dstypes.com.raytheon.uf.common.auth.user import User -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/localization/stream/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/__init__.py index 78f0207..bcd5fb1 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/__init__.py @@ -9,7 +9,7 @@ __all__ = [ 'LocalizationStreamPutRequest' ] -from AbstractLocalizationStreamRequest import AbstractLocalizationStreamRequest -from LocalizationStreamGetRequest import LocalizationStreamGetRequest -from LocalizationStreamPutRequest import LocalizationStreamPutRequest +from .AbstractLocalizationStreamRequest import AbstractLocalizationStreamRequest +from .LocalizationStreamGetRequest import LocalizationStreamGetRequest +from .LocalizationStreamPutRequest import LocalizationStreamPutRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/management/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/management/request/__init__.py index 077a22f..b441879 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/management/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/management/request/__init__.py @@ -9,6 +9,6 @@ __all__ = [ 'PassThroughRequest' ] -from ChangeContextRequest import ChangeContextRequest -from PassThroughRequest import PassThroughRequest +from .ChangeContextRequest import ChangeContextRequest +from .PassThroughRequest import PassThroughRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/management/request/diagnostic/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/management/request/diagnostic/__init__.py index d7540a6..48d6d82 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/management/request/diagnostic/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/management/request/diagnostic/__init__.py @@ -9,7 +9,7 @@ __all__ = [ 'StatusRequest' ] -from GetClusterMembersRequest import GetClusterMembersRequest -from GetContextsRequest import GetContextsRequest -from StatusRequest import StatusRequest +from .GetClusterMembersRequest import GetClusterMembersRequest +from .GetContextsRequest import GetContextsRequest +from .StatusRequest import StatusRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/management/response/diagnostic/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/management/response/diagnostic/__init__.py index 68aa8b0..8849806 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/management/response/diagnostic/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/management/response/diagnostic/__init__.py @@ -9,7 +9,7 @@ __all__ = [ 'StatusResponse' ] -from ClusterMembersResponse import ClusterMembersResponse -from ContextsResponse import ContextsResponse -from StatusResponse import StatusResponse +from .ClusterMembersResponse import ClusterMembersResponse +from .ContextsResponse import ContextsResponse +from .StatusResponse import StatusResponse diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py index 89205ea..7b01177 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py @@ -3,7 +3,7 @@ # File auto-generated against equivalent DynamicSerialize Java class -from Property import Property +from .Property import Property class Header(object): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py index 7516009..36b2369 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py @@ -16,7 +16,10 @@ import struct import socket import os import pwd -import thread +try: + import _thread +except ImportError: + import thread class WsId(object): @@ -35,7 +38,7 @@ class WsId(object): self.pid = os.getpid() - self.threadId = long(thread.get_ident()) + self.threadId = int(thread.get_ident()) def getNetworkId(self): return self.networkId diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/__init__.py index 53a9451..e4ad2b5 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/__init__.py @@ -23,8 +23,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 diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/pointdata/requests/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/pointdata/requests/__init__.py index 272e904..982dcbd 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/pointdata/requests/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/pointdata/requests/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'NewAdaptivePlotRequest' ] -from NewAdaptivePlotRequest import NewAdaptivePlotRequest +from .NewAdaptivePlotRequest import NewAdaptivePlotRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/__init__.py index 382dda0..b969886 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/__init__.py @@ -10,5 +10,5 @@ __all__ = [ 'PointTest' ] -from PointTest import PointTest +from .PointTest import PointTest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/records/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/records/__init__.py index c0a2cd5..0caa5fd 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/records/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/records/__init__.py @@ -19,5 +19,5 @@ __all__ = [ 'CompressedDataRecord' ] -from CompressedDataRecord import CompressedDataRecord +from .CompressedDataRecord import CompressedDataRecord diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/__init__.py index 762c469..d95c374 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/__init__.py @@ -17,14 +17,14 @@ __all__ = [ 'StoreRequest' ] -from CopyRequest import CopyRequest -from CreateDatasetRequest import CreateDatasetRequest -from DatasetDataRequest import DatasetDataRequest -from DatasetNamesRequest import DatasetNamesRequest -from DeleteFilesRequest import DeleteFilesRequest -from DeleteOrphansRequest import DeleteOrphansRequest -from DeleteRequest import DeleteRequest -from GroupsRequest import GroupsRequest -from RepackRequest import RepackRequest -from RetrieveRequest import RetrieveRequest -from StoreRequest import StoreRequest +from .CopyRequest import CopyRequest +from .CreateDatasetRequest import CreateDatasetRequest +from .DatasetDataRequest import DatasetDataRequest +from .DatasetNamesRequest import DatasetNamesRequest +from .DeleteFilesRequest import DeleteFilesRequest +from .DeleteOrphansRequest import DeleteOrphansRequest +from .DeleteRequest import DeleteRequest +from .GroupsRequest import GroupsRequest +from .RepackRequest import RepackRequest +from .RetrieveRequest import RetrieveRequest +from .StoreRequest import StoreRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/response/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/response/__init__.py index 5226fb5..916acda 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/response/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/response/__init__.py @@ -11,8 +11,8 @@ __all__ = [ 'StoreResponse' ] -from DeleteResponse import DeleteResponse -from ErrorResponse import ErrorResponse -from FileActionResponse import FileActionResponse -from RetrieveResponse import RetrieveResponse -from StoreResponse import StoreResponse +from .DeleteResponse import DeleteResponse +from .ErrorResponse import ErrorResponse +from .FileActionResponse import FileActionResponse +from .RetrieveResponse import RetrieveResponse +from .StoreResponse import StoreResponse diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/__init__.py index 5e3214d..a628c45 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/__init__.py @@ -21,4 +21,4 @@ __all__ = [ 'SerializableExceptionWrapper' ] -from SerializableExceptionWrapper import SerializableExceptionWrapper +from .SerializableExceptionWrapper import SerializableExceptionWrapper diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/comm/response/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/comm/response/__init__.py index 4481204..d37e865 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/comm/response/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/comm/response/__init__.py @@ -20,4 +20,4 @@ __all__ = [ 'ServerErrorResponse' ] -from ServerErrorResponse import ServerErrorResponse +from .ServerErrorResponse import ServerErrorResponse diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/ClusterActivationNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/ClusterActivationNotification.py index a88de39..50171a3 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/ClusterActivationNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/ClusterActivationNotification.py @@ -10,7 +10,7 @@ ## # File auto-generated against equivalent DynamicSerialize Java class -from SiteActivationNotification import SiteActivationNotification +from .SiteActivationNotification import SiteActivationNotification class ClusterActivationNotification(SiteActivationNotification): def __init__(self): @@ -38,4 +38,4 @@ class ClusterActivationNotification(SiteActivationNotification): else: s += " has been successfully deactivated on all cluster members" - return s \ No newline at end of file + return s diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/__init__.py index dc246a2..1a32aea 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/__init__.py @@ -8,6 +8,6 @@ __all__ = [ 'SiteActivationNotification' ] -from ClusterActivationNotification import ClusterActivationNotification -from SiteActivationNotification import SiteActivationNotification +from .ClusterActivationNotification import ClusterActivationNotification +from .SiteActivationNotification import SiteActivationNotification diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/site/requests/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/site/requests/__init__.py index 61c8725..2f90e6b 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/site/requests/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/site/requests/__init__.py @@ -11,9 +11,9 @@ __all__ = [ 'ValidateConfigRequest' ] -from ActivateSiteRequest import ActivateSiteRequest -from DeactivateSiteRequest import DeactivateSiteRequest -from GetActiveSitesRequest import GetActiveSitesRequest -from GetPrimarySiteRequest import GetPrimarySiteRequest -from ValidateConfigRequest import ValidateConfigRequest +from .ActivateSiteRequest import ActivateSiteRequest +from .DeactivateSiteRequest import DeactivateSiteRequest +from .GetActiveSitesRequest import GetActiveSitesRequest +from .GetPrimarySiteRequest import GetPrimarySiteRequest +from .ValidateConfigRequest import ValidateConfigRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py index 1ffde0f..42593dd 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py @@ -26,13 +26,14 @@ import calendar import datetime import numpy import re -import StringIO +from six.moves import cStringIO as StringIO + import time from dynamicserialize.dstypes.java.util import Date from dynamicserialize.dstypes.java.util import EnumSet -from TimeRange import TimeRange +from .TimeRange import TimeRange _DATE=r'(\d{4}-\d{2}-\d{2})' _TIME=r'(\d{2}:\d{2}:\d{2})' @@ -70,16 +71,16 @@ class DataTime(object): if self.refTime is not None: if isinstance(self.refTime, datetime.datetime): - self.refTime = long(calendar.timegm(self.refTime.utctimetuple()) * 1000) + self.refTime = int(calendar.timegm(self.refTime.utctimetuple()) * 1000) elif isinstance(self.refTime, time.struct_time): - self.refTime = long(calendar.timegm(self.refTime) * 1000) + self.refTime = int(calendar.timegm(self.refTime) * 1000) elif hasattr(self.refTime, 'getTime'): # getTime should be returning ms, there is no way to check this # This is expected for java Date - self.refTime = long(self.refTime.getTime()) + self.refTime = int(self.refTime.getTime()) else: try: - self.refTime = long(self.refTime) + self.refTime = int(self.refTime) except ValueError: # Assume first arg is a string. Attempt to parse. match = STR_PATTERN.match(self.refTime) @@ -98,9 +99,9 @@ class DataTime(object): self.refTime = self._getTimeAsEpochMillis(rDate, rTime, rMillis) if fcstTimeHr is not None: - self.fcstTime = long(fcstTimeHr) * 3600 + self.fcstTime = int(fcstTimeHr) * 3600 if fcstTimeMin is not None: - self.fcstTime += long(fcstTimeMin) * 60 + self.fcstTime += int(fcstTimeMin) * 60 if periodStart[0] is not None: self.validPeriod = TimeRange() @@ -112,7 +113,7 @@ class DataTime(object): self.refTime = Date(self.refTime) if self.validPeriod is None: - validTimeMillis = self.refTime.getTime() + long(self.fcstTime * 1000) + validTimeMillis = self.refTime.getTime() + int(self.fcstTime * 1000) self.validPeriod = TimeRange() self.validPeriod.setStart(validTimeMillis / 1000) self.validPeriod.setEnd(validTimeMillis / 1000) @@ -154,7 +155,7 @@ class DataTime(object): self.levelValue = numpy.float64(levelValue) def __str__(self): - buffer = StringIO.StringIO() + buffer = StringIO() if self.refTime is not None: refTimeInSecs = self.refTime.getTime() / 1000 @@ -269,4 +270,4 @@ class DataTime(object): def _getTimeAsEpochMillis(self, dateStr, timeStr, millis): t = time.strptime(dateStr + ' ' + timeStr, '%Y-%m-%d %H:%M:%S') epochSeconds = calendar.timegm(t) - return long(epochSeconds * 1000) + long(millis) + return int(epochSeconds * 1000) + int(millis) diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py index 8070905..ff3c49f 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py @@ -10,7 +10,7 @@ # 06/23/2016 #5696 rjpeter Extend CommutativeTimestamp ## -from CommutativeTimestamp import CommutativeTimestamp +from .CommutativeTimestamp import CommutativeTimestamp # TODO: Remove after 16.4.1 no longer in field class FormattedDate(CommutativeTimestamp): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/TimeRange.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/TimeRange.py index 8aab7cb..752676b 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/time/TimeRange.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/TimeRange.py @@ -63,10 +63,10 @@ class TimeRange(object): return datetime.datetime(*timeArg[:6]) elif isinstance(timeArg, float): # seconds as float, should be avoided due to floating point errors - totalSecs = long(timeArg) + totalSecs = int(timeArg) micros = int((timeArg - totalSecs) * MICROS_IN_SECOND) return self.__convertSecsAndMicros(totalSecs, micros) - elif isinstance(timeArg, (int, long)): + elif isinstance(timeArg, (int, int)): # seconds as integer totalSecs = timeArg return self.__convertSecsAndMicros(totalSecs, 0) @@ -97,7 +97,7 @@ class TimeRange(object): return self._getInMillis(self.end) def _getInMillis(self, time): - rval = long(calendar.timegm(time.utctimetuple()) * 1000) + rval = int(calendar.timegm(time.utctimetuple()) * 1000) rval += time.microsecond // 1000 return rval @@ -106,7 +106,7 @@ class TimeRange(object): def duration(self): delta = self.end - self.start - return long(delta.total_seconds()) + return int(delta.total_seconds()) def contains(self, timeArg): if isinstance(timeArg, TimeRange): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py index 5862608..264b34a 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py @@ -10,8 +10,8 @@ __all__ = [ 'TimeRange' ] -from DataTime import DataTime -from TimeRange import TimeRange -from FormattedDate import FormattedDate -from CommutativeTimestamp import CommutativeTimestamp +from .DataTime import DataTime +from .TimeRange import TimeRange +from .FormattedDate import FormattedDate +from .CommutativeTimestamp import CommutativeTimestamp diff --git a/dynamicserialize/dstypes/com/vividsolutions/jts/geom/__init__.py b/dynamicserialize/dstypes/com/vividsolutions/jts/geom/__init__.py index 46e0e5d..ee9ebd2 100644 --- a/dynamicserialize/dstypes/com/vividsolutions/jts/geom/__init__.py +++ b/dynamicserialize/dstypes/com/vividsolutions/jts/geom/__init__.py @@ -9,7 +9,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 diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/__init__.py index 1d83f34..5fed242 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/__init__.py @@ -5,5 +5,5 @@ __all__ = [ 'RetrieveAtcfDeckRequest' ] -from RetrieveAtcfDeckRequest import RetrieveAtcfDeckRequest +from .RetrieveAtcfDeckRequest import RetrieveAtcfDeckRequest diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py index 9ef0c44..8943267 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py @@ -14,14 +14,14 @@ __all__ = [ 'UpperAirDataRequest' ] -from GetGridDataRequest import GetGridDataRequest -from GetGridInfoRequest import GetGridInfoRequest -from GetGridNavRequest import GetGridNavRequest -from GetStationsRequest import GetStationsRequest -from GetTimesRequest import GetTimesRequest -from GetTimesResponse import GetTimesResponse -from Station import Station -from StationDataRequest import StationDataRequest -from SurfaceDataRequest import SurfaceDataRequest -from UpperAirDataRequest import UpperAirDataRequest +from .GetGridDataRequest import GetGridDataRequest +from .GetGridInfoRequest import GetGridInfoRequest +from .GetGridNavRequest import GetGridNavRequest +from .GetStationsRequest import GetStationsRequest +from .GetTimesRequest import GetTimesRequest +from .GetTimesResponse import GetTimesResponse +from .Station import Station +from .StationDataRequest import StationDataRequest +from .SurfaceDataRequest import SurfaceDataRequest +from .UpperAirDataRequest import UpperAirDataRequest diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/query/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/query/__init__.py index bfec6fc..6a24ef2 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/query/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/query/__init__.py @@ -5,4 +5,4 @@ __all__ = [ 'GenericPointDataReqMsg' ] -from GenericPointDataReqMsg import GenericPointDataReqMsg +from .GenericPointDataReqMsg import GenericPointDataReqMsg diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py index 9e3cae9..9c164cc 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py @@ -9,7 +9,7 @@ __all__ = [ 'ResponseMessageValidate' ] -from ActivityInfo import ActivityInfo -from DerivedProduct import DerivedProduct -from ResponseMessageValidate import ResponseMessageValidate +from .ActivityInfo import ActivityInfo +from .DerivedProduct import DerivedProduct +from .ResponseMessageValidate import ResponseMessageValidate diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py index 7e4413c..6a29463 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py @@ -8,8 +8,8 @@ __all__ = [ 'StoreDerivedProductRequest' ] -from RetrieveAllProductsRequest import RetrieveAllProductsRequest -from StoreActivityRequest import StoreActivityRequest -from StoreDerivedProductRequest import StoreDerivedProductRequest -from RetrieveActivityMapRequest import RetrieveActivityMapRequest +from .RetrieveAllProductsRequest import RetrieveAllProductsRequest +from .StoreActivityRequest import StoreActivityRequest +from .StoreDerivedProductRequest import StoreDerivedProductRequest +from .RetrieveActivityMapRequest import RetrieveActivityMapRequest diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/response/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/response/__init__.py index 99b5b4f..529412e 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/response/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/response/__init__.py @@ -6,6 +6,6 @@ __all__ = [ 'RetrieveActivityMapResponse' ] -from ActivityMapData import ActivityMapData -from RetrieveActivityMapResponse import RetrieveActivityMapResponse +from .ActivityMapData import ActivityMapData +from .RetrieveActivityMapResponse import RetrieveActivityMapResponse diff --git a/dynamicserialize/dstypes/java/awt/__init__.py b/dynamicserialize/dstypes/java/awt/__init__.py index 041ce68..d27224f 100644 --- a/dynamicserialize/dstypes/java/awt/__init__.py +++ b/dynamicserialize/dstypes/java/awt/__init__.py @@ -20,4 +20,4 @@ __all__ = [ 'Point' ] -from Point import Point +from .Point import Point diff --git a/dynamicserialize/dstypes/java/lang/__init__.py b/dynamicserialize/dstypes/java/lang/__init__.py index 639d0c0..20e0e64 100644 --- a/dynamicserialize/dstypes/java/lang/__init__.py +++ b/dynamicserialize/dstypes/java/lang/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'StackTraceElement' ] -from StackTraceElement import StackTraceElement +from .StackTraceElement import StackTraceElement diff --git a/dynamicserialize/dstypes/java/sql/Timestamp.py b/dynamicserialize/dstypes/java/sql/Timestamp.py index 0b46249..bb287b7 100644 --- a/dynamicserialize/dstypes/java/sql/Timestamp.py +++ b/dynamicserialize/dstypes/java/sql/Timestamp.py @@ -23,4 +23,4 @@ class Timestamp(Date): super(Timestamp, self).__init__(time) def __repr__(self): - return strftime("%Y-%m-%d %H:%M:%S.", gmtime(self.time/1000.0)) + '{:03d}'.format(self.time%1000) \ No newline at end of file + return strftime("%Y-%m-%d %H:%M:%S.", gmtime(self.time/1000.0)) + '{:03d}'.format(self.time%1000) diff --git a/dynamicserialize/dstypes/java/sql/__init__.py b/dynamicserialize/dstypes/java/sql/__init__.py index a7fe633..b1823d8 100644 --- a/dynamicserialize/dstypes/java/sql/__init__.py +++ b/dynamicserialize/dstypes/java/sql/__init__.py @@ -7,4 +7,4 @@ __all__ = [ 'Timestamp' ] -from Timestamp import Timestamp +from .Timestamp import Timestamp diff --git a/dynamicserialize/dstypes/java/util/__init__.py b/dynamicserialize/dstypes/java/util/__init__.py index 5c13725..4ba0ac8 100644 --- a/dynamicserialize/dstypes/java/util/__init__.py +++ b/dynamicserialize/dstypes/java/util/__init__.py @@ -10,8 +10,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