xan/python-awips
1
0
Fork 0
mirror of https://github.com/Unidata/python-awips.git synced 2025-02-23 22:57:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

formatting and naming to avoid redefining built-ins

Browse source
This commit is contained in:
Michael James 2018-10-06 08:11:25 -06:00
parent f630dc6925
commit d78b5d5a4d
4 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
awips/dataaccess/DataAccessLayer.py
View file

@ -1,7 +1,3 @@
# #
# #
# #
# Published interface for awips.dataaccess package # Published interface for awips.dataaccess package
# #
@ -30,7 +26,6 @@
import sys import sys
import subprocess
import warnings import warnings
THRIFT_HOST = "edex" THRIFT_HOST = "edex"

8
awips/dataaccess/DataNotificationLayer.py
View file

@ -1,6 +1,3 @@
# #
# #
# #
# Published interface for retrieving data updates via awips.dataaccess package # Published interface for retrieving data updates via awips.dataaccess package
# #
@ -51,7 +48,6 @@ each time a METAR is received from there.
import re import re
import sys import sys
import subprocess
from awips.dataaccess.PyGeometryNotification import PyGeometryNotification from awips.dataaccess.PyGeometryNotification import PyGeometryNotification
from awips.dataaccess.PyGridNotification import PyGridNotification from awips.dataaccess.PyGridNotification import PyGridNotification
@ -95,9 +91,9 @@ def getGridDataUpdates(request):
calling its subscribe() method calling its subscribe() method
""" """
response = router.getNotificationFilter(request) response = router.getNotificationFilter(request)
filter = response.getNotificationFilter() notificationFilter = response.getNotificationFilter()
jmsInfo = _getJmsConnectionInfo(response) jmsInfo = _getJmsConnectionInfo(response)
notifier = PyGridNotification(request, filter, requestHost=THRIFT_HOST, **jmsInfo) notifier = PyGridNotification(request, notificationFilter, requestHost=THRIFT_HOST, **jmsInfo)
return notifier return notifier

4
awips/dataaccess/PyGeometryData.py
View file

@ -60,6 +60,6 @@ class PyGeometryData(IGeometryData, PyData.PyData):
return unit.decode('utf-8') return unit.decode('utf-8')
def getType(self, param): def getType(self, param):
param = param.encode('utf-8') param = param
type = self.__dataMap[param][1] type = self.__dataMap[param][1]
return type.decode('utf-8') return type

5
awips/dataaccess/PyNotification.py
View file

@ -34,11 +34,12 @@ class PyNotification(with_metaclass(abc.ABCMeta, INotificationSubscriber)):
specified filtering criteria. specified filtering criteria.
""" """
def __init__(self, request, filter, host='localhost', port=5672, requestHost='localhost'): def __init__(self, request, notificationFilter, host='localhost',
port=5672, requestHost='localhost'):
self.DAL = DataAccessLayer self.DAL = DataAccessLayer
self.DAL.changeEDEXHost(requestHost) self.DAL.changeEDEXHost(requestHost)
self.request = request self.request = request
self.notificationFilter = filter self.notificationFilter = notificationFilter
self.__topicSubscriber = QpidSubscriber(host, port, decompress=True) self.__topicSubscriber = QpidSubscriber(host, port, decompress=True)
self.__topicName = "edex.alerts" self.__topicName = "edex.alerts"
self.callback = None self.callback = None