openstack/deb-python-keystoneclient
Code Issues Proposed changes

Merge "Deprecate ServiceCatalog.get_urls() with no attr"

Browse Source
This commit is contained in:
Jenkins
2015-08-25 23:12:00 +00:00
committed by Gerrit Code Review
parent d22cd9dcab 0d293eaf44
commit ac56faa6ef
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
keystoneclient/service_catalog.py
View File

@@ -191,10 +191,13 @@ class ServiceCatalog(object):
except KeyError: except KeyError:
return return
# TODO(jamielennox): at least swiftclient is known to set attr and not if attr and not filter_value:
# filter_value and expects that to mean that filtering is ignored, so warnings.warn(
# we can't check for the presence of attr. This behaviour should be 'Providing attr without filter_value to get_urls() is '
# deprecated and an appropriate warning provided. '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: if filter_value:
return [endpoint for endpoint in endpoints return [endpoint for endpoint in endpoints
if endpoint.get(attr) == filter_value] if endpoint.get(attr) == filter_value]