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

Merge pull request #109 from srcarter3/v20

Browse source 
Replace type() with isinstance()
This commit is contained in:
srcarter3 2023-08-31 11:23:33 -06:00 • committed by GitHub
commit 853c011507
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
awips/gfe/IFPClient.py
View file

@ -42,7 +42,7 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.server.messa
# Date Ticket# Engineer Description # Date Ticket# Engineer Description
# ------------ ---------- ----------- -------------------------- # ------------ ---------- ----------- --------------------------
# 07/26/12 dgilling Initial Creation. # 07/26/12 dgilling Initial Creation.
# # 08/31/23 srcarter@ucar From MJ - replace type with isinstance
# #
# #
@ -59,7 +59,7 @@ class IFPClient(object):
self.__siteId = site self.__siteId = site
def commitGrid(self, request): def commitGrid(self, request):
if type(request) is CommitGridRequest: if isinstance(request, CommitGridRequest):
return self.__commitGrid([request]) return self.__commitGrid([request])
elif self.__isHomogenousIterable(request, CommitGridRequest): elif self.__isHomogenousIterable(request, CommitGridRequest):
return self.__commitGrid([cgr for cgr in request]) return self.__commitGrid([cgr for cgr in request])
@ -74,8 +74,7 @@ class IFPClient(object):
return ssr return ssr
def getParmList(self, id): def getParmList(self, id):
argType = type(id) if isinstance(argType, DatabaseID):
if argType is DatabaseID:
return self.__getParmList([id]) return self.__getParmList([id])
elif self.__isHomogenousIterable(id, DatabaseID): elif self.__isHomogenousIterable(id, DatabaseID):
return self.__getParmList([dbid for dbid in id]) return self.__getParmList([dbid for dbid in id])
@ -102,7 +101,7 @@ class IFPClient(object):
return True return True
def getGridInventory(self, parmID): def getGridInventory(self, parmID):
if type(parmID) is ParmID: if isinstance(parmID, ParmID):
sr = self.__getGridInventory([parmID]) sr = self.__getGridInventory([parmID])
list = [] list = []
try: try:

4
dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.py
View file

@ -39,12 +39,12 @@ class GFERecord(PersistableDataObject):
self.dataTime = None self.dataTime = None
self.parmId = None self.parmId = None
if timeRange is not None: if timeRange is not None:
if type(timeRange) is TimeRange: if isinstance(timeRange, TimeRange):
self.dataTime = DataTime(refTime=timeRange.getStart(), validPeriod=timeRange) self.dataTime = DataTime(refTime=timeRange.getStart(), validPeriod=timeRange)
else: else:
raise TypeError("Invalid TimeRange object specified.") raise TypeError("Invalid TimeRange object specified.")
if parmId is not None: if parmId is not None:
if type(parmId) is ParmID.ParmID: if isinstance(parmId, ParmID.ParmID):
self.parmId = parmId self.parmId = parmId
self.parmName = parmId.getParmName() self.parmName = parmId.getParmName()
self.parmLevel = parmId.getParmLevel() self.parmLevel = parmId.getParmLevel()

4
dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/db/objects/ParmID.py
View file

@ -36,9 +36,9 @@ class ParmID(object):
if (parmIdentifier is not None) and (dbId is not None): if (parmIdentifier is not None) and (dbId is not None):
self.parmName = parmIdentifier self.parmName = parmIdentifier
if type(dbId) is DatabaseID: if isinstance(dbId, DatabaseID):
self.dbId = dbId self.dbId = dbId
elif type(dbId) is str: elif isinstance(dbId, str):
self.dbId = DatabaseID(dbId) self.dbId = DatabaseID(dbId)
else: else:
raise TypeError("Invalid database ID specified.") raise TypeError("Invalid database ID specified.")

16
dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py
View file

@ -31,7 +31,7 @@
# 06/29/15 4480 dgilling Implement __hash__, __eq__, # 06/29/15 4480 dgilling Implement __hash__, __eq__,
# __str__ and rich comparison operators. # __str__ and rich comparison operators.
# 02/17/22 8608 mapeters Subclass PersistableDataObject # 02/17/22 8608 mapeters Subclass PersistableDataObject
# # 08/31/23 srcarter@ucar From MJ - replace type with isinstance
# #
import numpy import numpy
@ -71,17 +71,15 @@ class Level(PersistableDataObject):
return hashCode return hashCode
def __eq__(self, other): def __eq__(self, other):
if type(self) != type(other): if isinstance(self, type(other)):
return False
else:
return (self.masterLevel, self.levelonevalue, self.leveltwovalue) == \ return (self.masterLevel, self.levelonevalue, self.leveltwovalue) == \
(other.masterLevel, other.levelonevalue, other.leveltwovalue) (other.masterLevel, other.levelonevalue, other.leveltwovalue)
return False
def __ne__(self, other): def __ne__(self, other):
return not self.__eq__(other) return not self.__eq__(other)
def __lt__(self, other): def __lt__(self, other):
if type(self) != type(other): if not isinstance(self, type(other)):
return NotImplemented return NotImplemented
elif self.masterLevel.getName() != other.masterLevel.getName(): elif self.masterLevel.getName() != other.masterLevel.getName():
return NotImplemented return NotImplemented
@ -113,7 +111,7 @@ class Level(PersistableDataObject):
return False return False
def __le__(self, other): def __le__(self, other):
if type(self) != type(other): if not isinstance(self, type(other)):
return NotImplemented return NotImplemented
elif self.masterLevel.getName() != other.masterLevel.getName(): elif self.masterLevel.getName() != other.masterLevel.getName():
return NotImplemented return NotImplemented
@ -121,7 +119,7 @@ class Level(PersistableDataObject):
return self.__lt__(other) or self.__eq__(other) return self.__lt__(other) or self.__eq__(other)
def __gt__(self, other): def __gt__(self, other):
if type(self) != type(other): if not isinstance(self, type(other)):
return NotImplemented return NotImplemented
elif self.masterLevel.getName() != other.masterLevel.getName(): elif self.masterLevel.getName() != other.masterLevel.getName():
return NotImplemented return NotImplemented
@ -153,7 +151,7 @@ class Level(PersistableDataObject):
return False return False
def __ge__(self, other): def __ge__(self, other):
if type(self) != type(other): if not isinstance(self, type(other)):
return NotImplemented return NotImplemented
elif self.masterLevel.getName() != other.masterLevel.getName(): elif self.masterLevel.getName() != other.masterLevel.getName():
return NotImplemented return NotImplemented

4
dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/MasterLevel.py
View file

@ -30,7 +30,7 @@
# 06/29/15 4480 dgilling Implement __hash__, __eq__ # 06/29/15 4480 dgilling Implement __hash__, __eq__
# and __str__. # and __str__.
# 02/17/22 8608 mapeters Subclass PersistableDataObject # 02/17/22 8608 mapeters Subclass PersistableDataObject
# # 08/31/23 srcarter@ucar From MJ - replace type with isinstance
# #
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.persist import PersistableDataObject from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.persist import PersistableDataObject
@ -49,7 +49,7 @@ class MasterLevel(PersistableDataObject):
return hash(self.name) return hash(self.name)
def __eq__(self, other): def __eq__(self, other):
if type(self) != type(other): if not isinstance(self, type(other)):
return False return False
else: else:
return self.name == other.name return self.name == other.name

14
dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/RequestConstraint.py
View file

@ -27,11 +27,11 @@
# Jun 27, 2016 5725 tgurney Add NOT IN # Jun 27, 2016 5725 tgurney Add NOT IN
# Jul 22, 2016 2416 tgurney Add evaluate() # Jul 22, 2016 2416 tgurney Add evaluate()
# Jun 26, 2019 7888 tgurney Python 3 fixes # Jun 26, 2019 7888 tgurney Python 3 fixes
# # Aug 31, 2023 srcarter@ucar Small formatting and logic changes
# #
import re import re
from ...time import DataTime from dynamicserialize.dstypes.com.raytheon.uf.common.time import DataTime
class RequestConstraint(object): class RequestConstraint(object):
@ -212,7 +212,7 @@ class RequestConstraint(object):
return self._evalValue.match(value) is not None return self._evalValue.match(value) is not None
def _evalIsNull(self, value): def _evalIsNull(self, value):
return value is None or 'null' == value return value is None or value == 'null'
# DAF-specific stuff begins here ########################################## # DAF-specific stuff begins here ##########################################
@ -228,11 +228,11 @@ class RequestConstraint(object):
@staticmethod @staticmethod
def _stringify(value): def _stringify(value):
if type(value) in {int, bool, float}: if isinstance(value, (int, bool, float)):
return str(value) return str(value)
elif type(value) is str: elif isinstance(value, str):
return value return value
elif type(value) is bytes: elif isinstance(value, bytes):
return value.decode() return value.decode()
else: else:
# Collections are not allowed; they are handled separately. # Collections are not allowed; they are handled separately.
@ -249,7 +249,7 @@ class RequestConstraint(object):
except TypeError: except TypeError:
raise TypeError("value for IN / NOT IN constraint must be an iterable") raise TypeError("value for IN / NOT IN constraint must be an iterable")
stringValue = ', '.join(cls._stringify(item) for item in iterator) stringValue = ', '.join(cls._stringify(item) for item in iterator)
if len(stringValue) == 0: if not stringValue:
raise ValueError('cannot use IN / NOT IN with empty collection') raise ValueError('cannot use IN / NOT IN with empty collection')
obj = cls() obj = cls()
obj.setConstraintType(constraintType) obj.setConstraintType(constraintType)

25
dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py
View file

@ -39,6 +39,7 @@
# plus misc cleanup # plus misc cleanup
# 09/13/19 7888 tgurney Python 3 division fixes # 09/13/19 7888 tgurney Python 3 division fixes
# 11/18/19 7881 tgurney Fix __hash__ # 11/18/19 7881 tgurney Fix __hash__
# 08/31/23 srcarter@ucar Small formatting fixes to match MJ's changes
import calendar import calendar
@ -59,12 +60,8 @@ _TIME = r'(\d{2}:\d{2}:\d{2})'
_MILLIS = '(?:\.(\d{1,3})(?:\d{1,4})?)?' _MILLIS = '(?:\.(\d{1,3})(?:\d{1,4})?)?'
REFTIME_PATTERN_STR = _DATE + '[ _]' + _TIME + _MILLIS REFTIME_PATTERN_STR = _DATE + '[ _]' + _TIME + _MILLIS
FORECAST_PATTERN_STR = r'(?:[ _]\((\d+)(?::(\d{1,2}))?\))?' FORECAST_PATTERN_STR = r'(?:[ _]\((\d+)(?::(\d{1,2}))?\))?'
VALID_PERIOD_PATTERN_STR = r'(?:\[' + REFTIME_PATTERN_STR + \ VALID_PERIOD_PATTERN_STR = r'(?:\[' + REFTIME_PATTERN_STR + '--' + REFTIME_PATTERN_STR + r'\])?'
'--' + REFTIME_PATTERN_STR + r'\])?' STR_PATTERN = re.compile(REFTIME_PATTERN_STR + FORECAST_PATTERN_STR + VALID_PERIOD_PATTERN_STR)
STR_PATTERN = re.compile(
REFTIME_PATTERN_STR +
FORECAST_PATTERN_STR +
VALID_PERIOD_PATTERN_STR)
class DataTime(object): class DataTime(object):
@ -88,18 +85,14 @@ class DataTime(object):
self.fcstTime = 0 self.fcstTime = 0
self.refTime = refTime self.refTime = refTime
if validPeriod is not None and not isinstance(validPeriod, TimeRange): if validPeriod is not None and not isinstance(validPeriod, TimeRange):
raise ValueError( raise ValueError("Invalid validPeriod object specified for DataTime.")
"Invalid validPeriod object specified for DataTime.")
self.validPeriod = validPeriod self.validPeriod = validPeriod
self.utilityFlags = EnumSet( self.utilityFlags = EnumSet('com.raytheon.uf.common.time.DataTime$FLAG')
'com.raytheon.uf.common.time.DataTime$FLAG')
self.levelValue = numpy.float64(-1.0) self.levelValue = numpy.float64(-1.0)
if self.refTime is not None: if self.refTime is not None:
if isinstance(self.refTime, datetime.datetime): if isinstance(self.refTime, datetime.datetime):
self.refTime = int( self.refTime = int(calendar.timegm(self.refTime.utctimetuple()) * 1000)
calendar.timegm(
self.refTime.utctimetuple()) * 1000)
elif isinstance(self.refTime, time.struct_time): elif isinstance(self.refTime, time.struct_time):
self.refTime = int(calendar.timegm(self.refTime) * 1000) self.refTime = int(calendar.timegm(self.refTime) * 1000)
elif hasattr(self.refTime, 'getTime'): elif hasattr(self.refTime, 'getTime'):
@ -124,8 +117,7 @@ class DataTime(object):
fcstTimeMin = groups[4] fcstTimeMin = groups[4]
periodStart = groups[5], groups[6], (groups[7] or 0) periodStart = groups[5], groups[6], (groups[7] or 0)
periodEnd = groups[8], groups[9], (groups[10] or 0) periodEnd = groups[8], groups[9], (groups[10] or 0)
self.refTime = self._getTimeAsEpochMillis( self.refTime = self._getTimeAsEpochMillis(rDate, rTime, rMillis)
rDate, rTime, rMillis)
if fcstTimeHr is not None: if fcstTimeHr is not None:
self.fcstTime = int(fcstTimeHr) * 3600 self.fcstTime = int(fcstTimeHr) * 3600
@ -134,8 +126,7 @@ class DataTime(object):
if periodStart[0] is not None: if periodStart[0] is not None:
self.validPeriod = TimeRange() self.validPeriod = TimeRange()
periodStartTime = self._getTimeAsEpochMillis( periodStartTime = self._getTimeAsEpochMillis(*periodStart)
*periodStart)
self.validPeriod.setStart(periodStartTime // 1000) self.validPeriod.setStart(periodStartTime // 1000)
periodEndTime = self._getTimeAsEpochMillis(*periodEnd) periodEndTime = self._getTimeAsEpochMillis(*periodEnd)
self.validPeriod.setEnd(periodEndTime // 1000) self.validPeriod.setEnd(periodEndTime // 1000)