Merge branches 'bbmaster' and 'master' of ssh://git.cy55.de/home/git/loops into bbmaster

2012-03-01 17:24:21 +01:00 · 2012-03-01 17:24:21 +01:00 · 931f308fc1
commit 931f308fc1
parent 6e36c6708c 91cdcc2c06
1 changed files with 2 additions and 1 deletions
--- a/common.py
+++ b/common.py
@ -479,8 +479,9 @@ class ParentRelation(object):
        return None

    def __set__(self, inst, value):
+        value = baseObject(value)
        rs = ParentRelationSet(inst, self.predicateName)
-        rsList = list(rs)
+        rsList = [baseObject(p) for p in rs]
        for current in rsList:
            if current != value:
                rs.remove(current)