From 64c4215033e5fbeb91337d19df1d1fb45fe22598 Mon Sep 17 00:00:00 2001 From: helmutm Date: Sat, 4 Mar 2006 14:50:38 +0000 Subject: [PATCH] Fix on DummyRelationRegistry git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@1109 fd906abe-77d9-0310-91a1-e0d9ade77398 --- relation/registry.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/relation/registry.py b/relation/registry.py index 8ba13c6..16fc1bf 100644 --- a/relation/registry.py +++ b/relation/registry.py @@ -87,15 +87,14 @@ class DummyRelationRegistry(object): crit = criteria[k] if k == 'relationship': critpn = crit.getPredicateName() - if ((critpn.endswith('*') - and not r.getPredicateName().startswith(critpn[:-1])) - and r.getPredicateName() != critpn): - hit = False - break + if critpn.endswith('*'): + if not r.getPredicateName().startswith(critpn[:-1]): + hit = False; break + elif r.getPredicateName() != critpn: + hit = False; break else: if not hasattr(r, k) or getattr(r, k) != crit: - hit = False - break + hit = False; break if hit: result.append(r) return result