merge cubicweb-version-3_1_4
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Mon, 06 Apr 2009 17:41:57 +0200
changeset 1257 e0e0a1c3d80f
parent 1256 f7b875c62039 (diff)
parent 1252 e782f333408b (current diff)
child 1258 0e132fbae9cc
merge
--- a/__pkginfo__.py	Mon Apr 06 17:22:58 2009 +0200
+++ b/__pkginfo__.py	Mon Apr 06 17:41:57 2009 +0200
@@ -6,7 +6,7 @@
 distname = "cubicweb"
 modname = "cubicweb"
 
-numversion = (3, 1, 3)
+numversion = (3, 1, 4)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL v2'
--- a/cwvreg.py	Mon Apr 06 17:22:58 2009 +0200
+++ b/cwvreg.py	Mon Apr 06 17:41:57 2009 +0200
@@ -322,9 +322,9 @@
         if vocab is not None:
             if callable(vocab):
                 # list() just in case its a generator function
-                vocabfunc = lambda e: list(vocab(propkey, req))
+                vocabfunc = lambda **kwargs: list(vocab(propkey, req))
             else:
-                vocabfunc = lambda e: vocab
+                vocabfunc = lambda **kwargs: vocab
             w = StaticComboBoxWidget(self, 'EProperty', self.schema['value'], 'String',
                                      vocabfunc=vocabfunc, description=tr(pdef['help']),
                                      **attrs)
--- a/debian/changelog	Mon Apr 06 17:22:58 2009 +0200
+++ b/debian/changelog	Mon Apr 06 17:41:57 2009 +0200
@@ -1,3 +1,9 @@
+cubicweb (3.1.4-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Aurélien Campéas <aurelien.campeas@logilab.fr>  Mon, 06 Apr 2009 14:30:00 +0200
+
 cubicweb (3.1.3-1) unstable; urgency=low
 
   * new upstream release