openstack
/
nova
Code Issues Proposed changes

Remove use of builtin name 

Change the use of the name 'filter' to 'filter_' so that it doesn't
conflict with the builtin function 'filter'.

Change-Id: Iaa18aa54fbd8578c3b0d3313540393541c002720
Closes-Bug:  #1459826
This commit is contained in:
EdLeafe 2015-05-28 16:23:49 -05:00
parent e5c169d155
commit 7fb641c831
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/filters.py
View File

@ -68,10 +68,10 @@ class BaseFilterHandler(loadables.BaseLoader):
def get_filtered_objects(self, filters, objs, filter_properties, index=0):
list_objs = list(objs)
LOG.debug("Starting with %d host(s)", len(list_objs))
for filter in filters:
if filter.run_filter_for_index(index):
cls_name = filter.__class__.__name__
objs = filter.filter_all(list_objs, filter_properties)
for filter_ in filters:
if filter_.run_filter_for_index(index):
cls_name = filter_.__class__.__name__
objs = filter_.filter_all(list_objs, filter_properties)
if objs is None:
LOG.debug("Filter %s says to stop filtering", cls_name)
return