[PATCH 1 of 2 seda] [pkg] Require cubicweb >= 3.25.4

Denis Laxalde denis.laxalde at logilab.fr
Tue Feb 6 09:59:32 CET 2018


# HG changeset patch
# User Denis Laxalde <denis at laxalde.org>
# Date 1517903793 -3600
#      Tue Feb 06 08:56:33 2018 +0100
# Node ID d06b9c2459cb332701f3a1fd924b7c1adf05491c
# Parent  2929e483c48a47b69434429c8a214fa0f68f0740
[pkg] Require cubicweb >= 3.25.4

And drop monkeypatch now in this version.

diff --git a/cubicweb_seda/__pkginfo__.py b/cubicweb_seda/__pkginfo__.py
--- a/cubicweb_seda/__pkginfo__.py
+++ b/cubicweb_seda/__pkginfo__.py
@@ -14,7 +14,7 @@ description = 'Data Exchange Standard fo
 web = 'http://www.cubicweb.org/project/%s' % distname
 
 __depends__ = {
-    'cubicweb': '>= 3.25.3, < 3.26',
+    'cubicweb': '>= 3.25.4, < 3.26',
     'six': '>= 1.4.0',
     'cubicweb-eac': None,
     'cubicweb-skos': '>= 0.12.1',
diff --git a/cubicweb_seda/site_cubicweb.py b/cubicweb_seda/site_cubicweb.py
--- a/cubicweb_seda/site_cubicweb.py
+++ b/cubicweb_seda/site_cubicweb.py
@@ -14,28 +14,9 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from logilab.common.decorators import monkeypatch
-
 from cubicweb.entity import Entity
-from cubicweb.rqlrewrite import RQLRelationRewriter
-from cubicweb.server import ssplanner
 
 Entity.cw_skip_copy_for.append(('container', 'subject'))
 Entity.cw_skip_copy_for.append(('container', 'object'))
 Entity.cw_skip_copy_for.append(('clone_of', 'subject'))
 Entity.cw_skip_copy_for.append(('clone_of', 'object'))
-
-
-# monkey-patch to allow using computed relation in WHERE clause of write queries
-# (https://www.cubicweb.org/ticket/17113286)
-
- at monkeypatch(ssplanner.SSPlanner)
-def _select_plan(self, plan, select, solutions):
-    union = ssplanner.Union()
-    union.append(select)
-    select.clean_solutions(solutions)
-    ssplanner.add_types_restriction(self.schema, select)
-    rewriter = RQLRelationRewriter(plan.cnx)
-    rewriter.rewrite(union, plan.args)
-    self.rqlhelper.annotate(union)
-    return self.build_select_plan(plan, union)



More information about the saem-devel mailing list