diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-01-07 13:43:15 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-01-07 13:43:15 +0000 |
commit | 61c74fc645ceb3eacb987ffe35d39dff81064f3e (patch) | |
tree | 12244962576fc05a5db8667f22f1262af3e6a7b1 | |
parent | 11d97cf309bd02769961adf3cd3a9af28e2a31e6 (diff) | |
parent | bc6ab131b5f0a89776c5b4670788fd3beab24073 (diff) | |
download | pycadf-61c74fc645ceb3eacb987ffe35d39dff81064f3e.tar.gz |
Merge "Python 3: replace 'basestring' by 'six.string_types'"
-rw-r--r-- | pycadf/attachment.py | 8 | ||||
-rw-r--r-- | pycadf/credential.py | 6 | ||||
-rw-r--r-- | pycadf/endpoint.py | 8 | ||||
-rw-r--r-- | pycadf/event.py | 6 | ||||
-rw-r--r-- | pycadf/geolocation.py | 28 | ||||
-rw-r--r-- | pycadf/host.py | 8 | ||||
-rw-r--r-- | pycadf/identifier.py | 4 | ||||
-rw-r--r-- | pycadf/metric.py | 8 | ||||
-rw-r--r-- | pycadf/path.py | 4 | ||||
-rw-r--r-- | pycadf/reason.py | 10 | ||||
-rw-r--r-- | pycadf/resource.py | 11 | ||||
-rw-r--r-- | pycadf/tag.py | 4 | ||||
-rw-r--r-- | pycadf/timestamp.py | 3 |
13 files changed, 69 insertions, 39 deletions
diff --git a/pycadf/attachment.py b/pycadf/attachment.py index 0191471..8519867 100644 --- a/pycadf/attachment.py +++ b/pycadf/attachment.py @@ -16,6 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from pycadf import cadftype ATTACHMENT_KEYNAME_TYPEURI = "typeURI" @@ -33,12 +35,12 @@ class Attachment(cadftype.CADFAbstractType): # the set of approved attachment types in order to # limit and validate them. typeURI = cadftype.ValidatorDescriptor(ATTACHMENT_KEYNAME_TYPEURI, - lambda x: isinstance(x, - basestring)) + lambda x: isinstance( + x, six.string_types)) content = cadftype.ValidatorDescriptor(ATTACHMENT_KEYNAME_CONTENT) name = cadftype.ValidatorDescriptor(ATTACHMENT_KEYNAME_NAME, lambda x: isinstance(x, - basestring)) + six.string_types)) def __init__(self, typeURI=None, content=None, name=None): # Attachment.typeURI diff --git a/pycadf/credential.py b/pycadf/credential.py index 55b85df..9274b80 100644 --- a/pycadf/credential.py +++ b/pycadf/credential.py @@ -14,6 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from pycadf import cadftype TYPE_URI_CRED = cadftype.CADF_VERSION_1_0_0 + 'credential' @@ -29,10 +31,10 @@ class Credential(cadftype.CADFAbstractType): type = cadftype.ValidatorDescriptor( CRED_KEYNAME_TYPE, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, six.string_types)) token = cadftype.ValidatorDescriptor( CRED_KEYNAME_TOKEN, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, six.string_types)) def __init__(self, token, type=None): diff --git a/pycadf/endpoint.py b/pycadf/endpoint.py index 2528767..95f9895 100644 --- a/pycadf/endpoint.py +++ b/pycadf/endpoint.py @@ -14,6 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from pycadf import cadftype TYPE_URI_ENDPOINT = cadftype.CADF_VERSION_1_0_0 + 'endpoint' @@ -30,11 +32,11 @@ ENDPOINT_KEYNAMES = [ENDPOINT_KEYNAME_URL, class Endpoint(cadftype.CADFAbstractType): url = cadftype.ValidatorDescriptor( - ENDPOINT_KEYNAME_URL, lambda x: isinstance(x, basestring)) + ENDPOINT_KEYNAME_URL, lambda x: isinstance(x, six.string_types)) name = cadftype.ValidatorDescriptor( - ENDPOINT_KEYNAME_NAME, lambda x: isinstance(x, basestring)) + ENDPOINT_KEYNAME_NAME, lambda x: isinstance(x, six.string_types)) port = cadftype.ValidatorDescriptor( - ENDPOINT_KEYNAME_PORT, lambda x: isinstance(x, basestring)) + ENDPOINT_KEYNAME_PORT, lambda x: isinstance(x, six.string_types)) def __init__(self, url, name=None, port=None): diff --git a/pycadf/event.py b/pycadf/event.py index 434bf3f..3931a31 100644 --- a/pycadf/event.py +++ b/pycadf/event.py @@ -16,6 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from pycadf import attachment from pycadf import cadftaxonomy from pycadf import cadftype @@ -97,8 +99,8 @@ class Event(cadftype.CADFAbstractType): EVENT_KEYNAME_REASON, lambda x: isinstance(x, reason.Reason) and x.is_valid()) severity = cadftype.ValidatorDescriptor(EVENT_KEYNAME_SEVERITY, - lambda x: isinstance(x, - basestring)) + lambda x: isinstance( + x, six.string_types)) observer = cadftype.ValidatorDescriptor( EVENT_KEYNAME_OBSERVER, (lambda x: isinstance(x, resource.Resource) and x.is_valid())) diff --git a/pycadf/geolocation.py b/pycadf/geolocation.py index e41487b..cbd6aa7 100644 --- a/pycadf/geolocation.py +++ b/pycadf/geolocation.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 @@ -52,26 +54,26 @@ class Geolocation(cadftype.CADFAbstractType): # TODO(mrutkows): we may want to do more validation to make # sure numeric range represented by string is valid latitude = cadftype.ValidatorDescriptor(GEO_KEYNAME_LATITUDE, - lambda x: isinstance(x, - basestring)) + lambda x: isinstance( + x, six.string_types)) longitude = cadftype.ValidatorDescriptor(GEO_KEYNAME_LONGITUDE, - lambda x: isinstance(x, - basestring)) + lambda x: isinstance( + x, six.string_types)) elevation = cadftype.ValidatorDescriptor(GEO_KEYNAME_ELEVATION, - lambda x: isinstance(x, - basestring)) + lambda x: isinstance( + x, six.string_types)) accuracy = cadftype.ValidatorDescriptor(GEO_KEYNAME_ACCURACY, - lambda x: isinstance(x, - basestring)) + lambda x: isinstance( + x, six.string_types)) city = cadftype.ValidatorDescriptor(GEO_KEYNAME_CITY, - lambda x: isinstance(x, - basestring)) + lambda x: isinstance( + x, six.string_types)) state = cadftype.ValidatorDescriptor(GEO_KEYNAME_STATE, - lambda x: isinstance(x, - basestring)) + lambda x: isinstance( + x, six.string_types)) regionICANN = cadftype.ValidatorDescriptor( GEO_KEYNAME_REGIONICANN, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, six.string_types)) def __init__(self, id=None, latitude=None, longitude=None, elevation=None, accuracy=None, city=None, state=None, diff --git a/pycadf/host.py b/pycadf/host.py index d606a0d..952b4f0 100644 --- a/pycadf/host.py +++ b/pycadf/host.py @@ -14,6 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from pycadf import cadftype from pycadf import identifier @@ -35,11 +37,11 @@ class Host(cadftype.CADFAbstractType): id = cadftype.ValidatorDescriptor( HOST_KEYNAME_ID, lambda x: identifier.is_valid(x)) address = cadftype.ValidatorDescriptor( - HOST_KEYNAME_ADDR, lambda x: isinstance(x, basestring)) + HOST_KEYNAME_ADDR, lambda x: isinstance(x, six.string_types)) agent = cadftype.ValidatorDescriptor( - HOST_KEYNAME_AGENT, lambda x: isinstance(x, basestring)) + HOST_KEYNAME_AGENT, lambda x: isinstance(x, six.string_types)) platform = cadftype.ValidatorDescriptor( - HOST_KEYNAME_PLATFORM, lambda x: isinstance(x, basestring)) + HOST_KEYNAME_PLATFORM, lambda x: isinstance(x, six.string_types)) def __init__(self, id=None, address=None, agent=None, platform=None): diff --git a/pycadf/identifier.py b/pycadf/identifier.py index 1c59234..7b76708 100644 --- a/pycadf/identifier.py +++ b/pycadf/identifier.py @@ -15,6 +15,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + +import six import uuid from oslo.config import cfg @@ -43,6 +45,6 @@ def norm_ns(str_id): # TODO(mrutkows): validate any cadf:Identifier (type) record against # CADF schema. This would include schema validation as an optional parm. def is_valid(value): - if not isinstance(value, basestring): + if not isinstance(value, six.string_types): raise TypeError return True 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 diff --git a/pycadf/path.py b/pycadf/path.py index 439d72f..b76ca9f 100644 --- a/pycadf/path.py +++ b/pycadf/path.py @@ -16,6 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from pycadf import cadftype @@ -32,7 +34,7 @@ class Path(cadftype.CADFAbstractType): # TODO(mrutkows): validate any cadf:Path (type) record against CADF schema @staticmethod def is_valid(value): - if not isinstance(value, basestring): + if not isinstance(value, six.string_types): raise TypeError return True diff --git a/pycadf/reason.py b/pycadf/reason.py index 85d4ed6..d4dd52b 100644 --- a/pycadf/reason.py +++ b/pycadf/reason.py @@ -16,6 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from pycadf import cadftype TYPE_URI_REASON = cadftype.CADF_VERSION_1_0_0 + 'reason' @@ -35,16 +37,16 @@ class Reason(cadftype.CADFAbstractType): reasonType = cadftype.ValidatorDescriptor( REASON_KEYNAME_REASONTYPE, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, six.string_types)) reasonCode = cadftype.ValidatorDescriptor( REASON_KEYNAME_REASONCODE, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, six.string_types)) policyType = cadftype.ValidatorDescriptor( REASON_KEYNAME_POLICYTYPE, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, six.string_types)) policyId = cadftype.ValidatorDescriptor( REASON_KEYNAME_POLICYID, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, six.string_types)) def __init__(self, reasonType=None, reasonCode=None, policyType=None, policyId=None): diff --git a/pycadf/resource.py b/pycadf/resource.py index 6398c1a..b1d15bf 100644 --- a/pycadf/resource.py +++ b/pycadf/resource.py @@ -16,6 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from pycadf import attachment from pycadf import cadftaxonomy from pycadf import cadftype @@ -59,9 +61,11 @@ class Resource(cadftype.CADFAbstractType): id = cadftype.ValidatorDescriptor(RESOURCE_KEYNAME_ID, lambda x: identifier.is_valid(x)) name = cadftype.ValidatorDescriptor(RESOURCE_KEYNAME_NAME, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, + six.string_types)) domain = cadftype.ValidatorDescriptor(RESOURCE_KEYNAME_DOMAIN, - lambda x: isinstance(x, basestring)) + lambda x: isinstance( + x, six.string_types)) credential = cadftype.ValidatorDescriptor( RESOURCE_KEYNAME_CRED, (lambda x: isinstance(x, credential.Credential) and x.is_valid())) @@ -73,7 +77,8 @@ class Resource(cadftype.CADFAbstractType): # in the past or a URL that is only valid within some domain (e.g. a # private cloud) ref = cadftype.ValidatorDescriptor(RESOURCE_KEYNAME_REF, - lambda x: isinstance(x, basestring)) + lambda x: isinstance(x, + six.string_types)) geolocation = cadftype.ValidatorDescriptor( RESOURCE_KEYNAME_GEO, lambda x: isinstance(x, geolocation.Geolocation)) diff --git a/pycadf/tag.py b/pycadf/tag.py index fbe7532..b9cb627 100644 --- a/pycadf/tag.py +++ b/pycadf/tag.py @@ -16,6 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + def generate_name_value_tag(name, value): # TODO(mrutkows): detailed test/concatenation of independent values @@ -29,6 +31,6 @@ def generate_name_value_tag(name, value): # TODO(mrutkows): validate any Tag's name?value= format def is_valid(value): - if not isinstance(value, basestring): + if not isinstance(value, six.string_types): raise TypeError return True diff --git a/pycadf/timestamp.py b/pycadf/timestamp.py index 0079c1b..0afd563 100644 --- a/pycadf/timestamp.py +++ b/pycadf/timestamp.py @@ -18,6 +18,7 @@ import datetime import pytz +import six TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f%z" @@ -35,7 +36,7 @@ def get_utc_now(timezone=None): # TODO(mrutkows): validate any cadf:Timestamp (type) record against # CADF schema def is_valid(value): - if not isinstance(value, basestring): + if not isinstance(value, six.string_types): raise ValueError('Timestamp should be a String') return True |