From 5c1990e8615c2c83e93629f1ba04fae2e304773e Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 11 Sep 2013 02:13:59 +0000 Subject: [PATCH] living proxy did not exclude living people with iter_people() svn: r23086 --- src/gen/proxy/living.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gen/proxy/living.py b/src/gen/proxy/living.py index 50e025fa0..c9866ba3f 100644 --- a/src/gen/proxy/living.py +++ b/src/gen/proxy/living.py @@ -111,11 +111,12 @@ class LivingProxyDb(ProxyDbBase): """ Protected version of iter_people """ - for person in ifilter(None, self.db.iter_people()): - if not(self.__is_living(person) and - self.mode == self.MODE_EXCLUDE_ALL): - - yield self.__restrict_person(person) + for person in filter(None, self.db.iter_people()): + if self.__is_living(person): + if self.mode == self.MODE_EXCLUDE_ALL: + continue + else: + yield self.__restrict_person(person) else: yield person