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

manual fixes

Browse source
This commit is contained in:
mjames-upc 2018-09-06 18:51:43 -06:00
parent 445461021c
commit 7a2dca5d37
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
awips/dataaccess/DataAccessLayer.py
View file

@ -23,6 +23,7 @@
# Jun 01, 2016 5587 tgurney Add new signatures for # Jun 01, 2016 5587 tgurney Add new signatures for
# getRequiredIdentifiers() and # getRequiredIdentifiers() and
# getOptionalIdentifiers() # getOptionalIdentifiers()
# Oct 07, 2016 ---- mjames@ucar Added getForecastRun
# Oct 18, 2016 5916 bsteffen Add setLazyLoadGridLatLon # Oct 18, 2016 5916 bsteffen Add setLazyLoadGridLatLon
# #
# #

2
awips/dataaccess/PyData.py
View file

@ -28,7 +28,7 @@ class PyData(IData):
return self.__attributes[key] return self.__attributes[key]
def getAttributes(self): def getAttributes(self):
return self.__attributes.keys() return list(self.__attributes.keys())
def getDataTime(self): def getDataTime(self):
return self.__time return self.__time

4
awips/dataaccess/SoundingsSupport.py
View file

@ -111,7 +111,7 @@ def __buildStringList(param):
return [str(param)] return [str(param)]
def __notStringIter(iterable): def __notStringIter(iterable):
if not isinstance(iterable, basestring): if not isinstance(iterable, str):
try: try:
iter(iterable) iter(iterable)
return True return True
@ -209,7 +209,7 @@ class _SoundingTimeLayer(object):
A list containing the valid levels for this sounding in order of A list containing the valid levels for this sounding in order of
closest to surface to highest from surface. closest to surface to highest from surface.
""" """
sortedLevels = [Level(level) for level in self._dataDict.keys()] sortedLevels = [Level(level) for level in list(self._dataDict.keys())]
sortedLevels.sort() sortedLevels.sort()
return [str(level) for level in sortedLevels] return [str(level) for level in sortedLevels]

3
awips/dataaccess/__init__.py
View file

@ -28,11 +28,10 @@ __all__ = [
import abc import abc
from six import with_metaclass from six import with_metaclass
class IDataRequest(object): class IDataRequest(with_metaclass(abc.ABCMeta, object)):
""" """
An IDataRequest to be submitted to the DataAccessLayer to retrieve data. An IDataRequest to be submitted to the DataAccessLayer to retrieve data.
""" """
__metaclass__ = abc.ABCMeta
@abc.abstractmethod @abc.abstractmethod
def setDatatype(self, datatype): def setDatatype(self, datatype):

10
awips/stomp.py
View file

@ -481,7 +481,7 @@ class Connection(object):
""" """
headers = {} headers = {}
for header_map in header_map_list: for header_map in header_map_list:
for header_key in header_map.keys(): for header_key in list(header_map.keys()):
headers[header_key] = header_map[header_key] headers[header_key] = header_map[header_key]
return headers return headers
@ -541,7 +541,7 @@ class Connection(object):
if self.__socket is not None: if self.__socket is not None:
frame = '%s\n%s\n%s\x00' % (command, frame = '%s\n%s\n%s\x00' % (command,
reduce(lambda accu, key: accu + ('%s:%s\n' % (key, list(headers[key]))), headers.keys(), ''), reduce(lambda accu, key: accu + ('%s:%s\n' % (key, headers[key])), list(headers.keys()), ''),
payload) payload)
self.__socket.sendall(frame) self.__socket.sendall(frame)
log.debug("Sent frame: type=%s, headers=%r, body=%r" % (command, headers, payload)) log.debug("Sent frame: type=%s, headers=%r, body=%r" % (command, headers, payload))
@ -804,13 +804,13 @@ if __name__ == '__main__':
self.c.start() self.c.start()
def __print_async(self, frame_type, headers, body): def __print_async(self, frame_type, headers, body):
print("\r \r",) #print("\r \r",)
print(frame_type) print(frame_type)
for header_key in list(headers.keys()): for header_key in list(headers.keys()):
print('%s: %s' % (header_key, headers[header_key])) print('%s: %s' % (header_key, headers[header_key]))
print("") print()
print(body) print(body)
print('> ',) print('> ', end=' ')
sys.stdout.flush() sys.stdout.flush()
def on_connecting(self, host_and_port): def on_connecting(self, host_and_port):

2
dynamicserialize/adapters/__init__.py
View file

@ -87,7 +87,7 @@ def registerAdapters(package, modules):
clzName = m.ClassAdapter clzName = m.ClassAdapter
classAdapterRegistry[clzName] = m classAdapterRegistry[clzName] = m
else: else:
raise LookupError('Adapter class ' + x + ' has no ClassAdapter field ' + raise LookupError('Adapter class ' + x + ' has no ClassAdapter field ' + \
'and cannot be registered.') 'and cannot be registered.')

6
dynamicserialize/dstypes/java/lang/StackTraceElement.py
View file

@ -42,13 +42,13 @@ class StackTraceElement(object):
return self.__repr__() return self.__repr__()
def __repr__(self): def __repr__(self):
msg = self.declaringClass + "." + self.methodName msg = self.declaringClass.decode('cp437') + "." + self.methodName.decode('cp437')
if self.isNativeMethod(): if self.isNativeMethod():
msg += "(Native Method)" msg += "(Native Method)"
elif self.fileName is not None and self.lineNumber >= 0: elif self.fileName is not None and self.lineNumber >= 0:
msg += "(" + self.fileName + ":" + str(self.lineNumber) + ")" msg += "(" + self.fileName.decode('cp437') + ":" + str(self.lineNumber) + ")"
elif self.fileName is not None: elif self.fileName is not None:
msg += "(" + self.fileName + ")" msg += "(" + self.fileName.decode('cp437') + ")"
else: else:
msg += "(Unknown Source)" msg += "(Unknown Source)"
return msg return msg