From 651726b54097c910d636c6648d00187aeb1eb256 Mon Sep 17 00:00:00 2001 From: Michael James Date: Tue, 4 Apr 2017 18:38:35 -0600 Subject: [PATCH] remnant python2 effects from 16.4.1 merge --- .../raytheon/uf/common/dataquery/requests/RequestConstraint.py | 2 +- .../com/raytheon/uf/common/dataquery/requests/__init__.py | 2 +- .../dstypes/com/raytheon/uf/common/time/FormattedDate.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/RequestConstraint.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/RequestConstraint.py index 5b60b71..3b0e019 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/RequestConstraint.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/RequestConstraint.py @@ -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)) diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/__init__.py index fdd0a6d..6c9c43d 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataquery/requests/__init__.py @@ -7,5 +7,5 @@ __all__ = [ 'RequestConstraint' ] -from RequestConstraint import RequestConstraint +from .RequestConstraint import RequestConstraint diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py index 8070905..ff3c49f 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py @@ -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):