merge stable
authorAlexandre Fayolle <alexandre.fayolle@logilab.fr>
Fri, 16 Oct 2009 18:44:28 +0200
branchstable
changeset 3713 a090324efefe
parent 3712 4b8d7838d74d (diff)
parent 3710 5bfdb591050a (current diff)
child 3714 3cb7dcd9ae77
merge
--- a/devtools/fill.py	Fri Oct 16 17:12:10 2009 +0200
+++ b/devtools/fill.py	Fri Oct 16 18:44:28 2009 +0200
@@ -397,9 +397,12 @@
             restrictions = ', '.join(c.restriction for c in constraints)
             q += ', %s' % restrictions
             # restrict object eids if possible
+            # XXX the attempt to restrict below in completely wrong
+            # disabling it for now
             objeids = select(restrictions, self.cursor)
         else:
             objeids = oedict.get(obj, frozenset())
+##         objeids = oedict.get(obj, frozenset())
         if subjcard in '?1' or objcard in '?1':
             for subjeid, objeid in used:
                 if subjcard in '?1' and subjeid in subjeids: