Revert removal of aq_base done in r40345 and do the same for accessor

generation when not using Utils


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43370 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/mixin/constraint.py

@@ -124,7 +124,7 @@ class ConstraintMixin(Predicate):
 
     XXX: remove as soon as the code is stable
     """
-    return self.asContext()
+    return self.asContext().aq_base
 
   def _getExpressionValue(self, obj, expression_string):
     """
@@ -243,4 +243,4 @@ class ConstraintMixin(Predicate):
   security.declareProtected(Permissions.AccessContentsInformation,
                             'applyOnAccessorHolder')
   def applyOnAccessorHolder(self, accessor_holder, expression_context, portal):
-    accessor_holder.constraints.append(self)
+    accessor_holder.constraints.append(self.asContext().aq_base)