remnant python2 effects from 16.4.1 merge

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

View file

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

View file

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

View file

@ -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):