668:b2e231cbd9da introduces unrelated changes that 1. break tests, 2. make rql>0.30.1 incompatible with cw < 3.13.10

authorSylvain Th?nault <sylvain.thenault@logilab.fr>
changesetdae50737d5fb
branchdefault
phasepublic
hiddenno
parent revision#b2e231cbd9da [rql] HAVING support in write queries (INSERT,SET,DELETE). Closes #81394
child revision#3daa0b5c31c5 update changelog
files modified by this revision
debian/control
stmts.py
test/unittest_nodes.py
# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1319529334 -7200
# Tue Oct 25 09:55:34 2011 +0200
# Node ID dae50737d5fb47c22f15a46590da1609a0841986
# Parent b2e231cbd9da735cbbfb814f31dbe2d70cd63fbe
668:b2e231cbd9da introduces unrelated changes that 1. break tests, 2. make rql>0.30.1 incompatible with cw < 3.13.10

diff --git a/debian/control b/debian/control
@@ -10,11 +10,11 @@
1 
2  Package: python-rql
3  Architecture: any
4  XB-Python-Version: ${python:Versions}
5  Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-logilab-common (>= 0.35.3-1), yapps2-runtime, python-logilab-database (>= 1.6.0)
6 -Conflicts: cubicweb-common (<= 3.8.3)
7 +Conflicts: cubicweb-common (<= 3.13.9)
8  Provides: ${python:Provides}
9  Description: relationship query language (RQL) utilities
10   A library providing the base utilities to handle RQL queries,
11   such as a parser, a type inferencer.
12 
diff --git a/stmts.py b/stmts.py
@@ -253,11 +253,11 @@
13          `tr`:
14            optional translation function taking a string as argument and
15            returning a string
16          """
17          if tr is None:
18 -            tr = lambda x: x
19 +            tr = lambda x,**k: x
20          return [c.get_description(mainindex, tr) for c in self.children]
21 
22      # repr / as_string / copy #################################################
23 
24      def __repr__(self):
diff --git a/test/unittest_nodes.py b/test/unittest_nodes.py
@@ -525,12 +525,12 @@
25          #annotator.annotate(tree)
26          # XXX how to choose
27          self.assertEqual(X.get_type(), 'Company')
28          self.assertEqual(X.get_type({'X': 'Person'}), 'Person')
29          #self.assertEqual(N.get_type(), 'String')
30 -        self.assertEqual(X.get_description(0, lambda x:x), 'Company, Person, Student')
31 -        self.assertEqual(N.get_description(0, lambda x:x), 'firstname, name')
32 +        self.assertEqual(X.get_description(0, lambda x,**k:x), 'Company, Person, Student')
33 +        self.assertEqual(N.get_description(0, lambda x,**k:x), 'firstname, name')
34          self.assertEqual(X.selected_index(), 0)
35          self.assertEqual(N.selected_index(), None)
36          self.assertEqual(X.main_relation(), None)
37 
38      # non regression tests ####################################################