diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-08-25 23:12:00 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-08-25 23:12:00 +0000 |
commit | ac56faa6ef3123c0bd6305fbaec378c3772cd6ea (patch) | |
tree | fe9ea76679925b2c1bd4392eb8f28d166135dc02 | |
parent | d22cd9dcab3d9f833e17a0b0d7be7c11b1428778 (diff) | |
parent | 0d293eaf4413f82f55e3b13062b2bc710a6f3935 (diff) | |
download | python-keystoneclient-ac56faa6ef3123c0bd6305fbaec378c3772cd6ea.tar.gz |
Merge "Deprecate ServiceCatalog.get_urls() with no attr"
-rw-r--r-- | keystoneclient/service_catalog.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/keystoneclient/service_catalog.py b/keystoneclient/service_catalog.py index b8f4ec2..bb64689 100644 --- a/keystoneclient/service_catalog.py +++ b/keystoneclient/service_catalog.py @@ -191,10 +191,13 @@ class ServiceCatalog(object): except KeyError: return - # TODO(jamielennox): at least swiftclient is known to set attr and not - # filter_value and expects that to mean that filtering is ignored, so - # we can't check for the presence of attr. This behaviour should be - # deprecated and an appropriate warning provided. + if attr and not filter_value: + warnings.warn( + 'Providing attr without filter_value to get_urls() is ' + 'deprecated as of the 1.7.0 release and may be removed in the ' + '2.0.0 release. Either both should be provided or neither ' + 'should be provided.') + if filter_value: return [endpoint for endpoint in endpoints if endpoint.get(attr) == filter_value] |