diff options
author | Cyril Roelandt <cyril.roelandt@enovance.com> | 2014-01-06 20:40:44 +0100 |
---|---|---|
committer | Cyril Roelandt <cyril.roelandt@enovance.com> | 2014-01-06 22:32:04 +0100 |
commit | bc6ab131b5f0a89776c5b4670788fd3beab24073 (patch) | |
tree | c53d294e9f88d5a9aa81a0873c79b61ede8aeedf /pycadf/metric.py | |
parent | e4fa4b5248a594f8cc0839b06b77c4828bea2cd1 (diff) | |
download | pycadf-bc6ab131b5f0a89776c5b4670788fd3beab24073.tar.gz |
Python 3: replace 'basestring' by 'six.string_types'
'basestring' will only work in Python 2. Using 'six.string_types' instead makes
the code compatible with both Python 2 and 3.
Change-Id: I572506ce6d0cc7570dc264711d19619746949d49
Diffstat (limited to 'pycadf/metric.py')
-rw-r--r-- | pycadf/metric.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pycadf/metric.py b/pycadf/metric.py index becce39..d110f2c 100644 --- a/pycadf/metric.py +++ b/pycadf/metric.py @@ -16,6 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from pycadf import cadftype from pycadf import identifier @@ -40,9 +42,11 @@ class Metric(cadftype.CADFAbstractType): metricId = cadftype.ValidatorDescriptor(METRIC_KEYNAME_METRICID, lambda x: identifier.is_valid(x)) unit = cadftype.ValidatorDescriptor(METRIC_KEYNAME_UNIT, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, + six.string_types)) name = cadftype.ValidatorDescriptor(METRIC_KEYNAME_NAME, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, + six.string_types)) def __init__(self, metricId=None, unit=None, name=None): # Metric.id |