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

remnant python2 effects from 16.4.1 merge

Browse source
This commit is contained in:
Michael James 2017-04-04 18:38:35 -06:00
parent 3b6d680d15
commit 651726b540
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,7 +95,7 @@ class RequestConstraint(object):
"""Build a new RequestConstraint.""" """Build a new RequestConstraint."""
try: try:
constraintType = cls.CONSTRAINT_MAP[operator.upper()] constraintType = cls.CONSTRAINT_MAP[operator.upper()]
except KeyError, AttributeError: except KeyError is AttributeError:
errmsg = '{} is not a valid operator. Valid operators are: {}' errmsg = '{} is not a valid operator. Valid operators are: {}'
validOperators = list(sorted(cls.CONSTRAINT_MAP.keys())) validOperators = list(sorted(cls.CONSTRAINT_MAP.keys()))
raise ValueError(errmsg.format(operator, validOperators)) raise ValueError(errmsg.format(operator, validOperators))

2
dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/__init__.py
View file

@ -7,5 +7,5 @@ __all__ = [
'RequestConstraint' 'RequestConstraint'
] ]
from RequestConstraint import RequestConstraint from .RequestConstraint import RequestConstraint

2
dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py
View file

@ -10,7 +10,7 @@
# 06/23/2016 #5696 rjpeter Extend CommutativeTimestamp # 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 # TODO: Remove after 16.4.1 no longer in field
class FormattedDate(CommutativeTimestamp): class FormattedDate(CommutativeTimestamp):