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>
Tue, 25 Oct 2011 09:55:34 +0200
changeset 669 dae50737d5fb
parent 668 b2e231cbd9da
child 670 3daa0b5c31c5
668:b2e231cbd9da introduces unrelated changes that 1. break tests, 2. make rql>0.30.1 incompatible with cw < 3.13.10
debian/control
stmts.py
test/unittest_nodes.py
--- a/debian/control	Mon Oct 24 17:49:58 2011 +0200
+++ b/debian/control	Tue Oct 25 09:55:34 2011 +0200
@@ -12,7 +12,7 @@
 Architecture: any
 XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-logilab-common (>= 0.35.3-1), yapps2-runtime, python-logilab-database (>= 1.6.0)
-Conflicts: cubicweb-common (<= 3.8.3)
+Conflicts: cubicweb-common (<= 3.13.9)
 Provides: ${python:Provides}
 Description: relationship query language (RQL) utilities
  A library providing the base utilities to handle RQL queries,
--- a/stmts.py	Mon Oct 24 17:49:58 2011 +0200
+++ b/stmts.py	Tue Oct 25 09:55:34 2011 +0200
@@ -255,7 +255,7 @@
           returning a string
         """
         if tr is None:
-            tr = lambda x: x
+            tr = lambda x,**k: x
         return [c.get_description(mainindex, tr) for c in self.children]
 
     # repr / as_string / copy #################################################
--- a/test/unittest_nodes.py	Mon Oct 24 17:49:58 2011 +0200
+++ b/test/unittest_nodes.py	Tue Oct 25 09:55:34 2011 +0200
@@ -527,8 +527,8 @@
         self.assertEqual(X.get_type(), 'Company')
         self.assertEqual(X.get_type({'X': 'Person'}), 'Person')
         #self.assertEqual(N.get_type(), 'String')
-        self.assertEqual(X.get_description(0, lambda x:x), 'Company, Person, Student')
-        self.assertEqual(N.get_description(0, lambda x:x), 'firstname, name')
+        self.assertEqual(X.get_description(0, lambda x,**k:x), 'Company, Person, Student')
+        self.assertEqual(N.get_description(0, lambda x,**k:x), 'firstname, name')
         self.assertEqual(X.selected_index(), 0)
         self.assertEqual(N.selected_index(), None)
         self.assertEqual(X.main_relation(), None)