# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1239036255 -7200
# Node ID fe1d2c243d5289b734c1b4b41aa9fc3cb85bbbc4
# Parent  1fdd93dfd7fa4de23b133156180e92a6219bfd4b# Parent  af40e615dc8981d1d10461494a9e8a0c1ffb7834
merge

diff -r af40e615dc89 -r fe1d2c243d52 .hgtags
--- a/.hgtags	Mon Apr 06 16:18:46 2009 +0200
+++ b/.hgtags	Mon Apr 06 18:44:15 2009 +0200
@@ -24,3 +24,5 @@
 a823124b812f4fa494bfceb773f3ca1cd00407e8 cubicweb-debian-version-3_1_2-1
 a5dc91adb7c133f83f5ad9cceb07bc246d21ed01 cubicweb-version-3_1_3
 9e98dec0768b87363a7826a04636dc161ed0ec7d cubicweb-debian-version-3_1_3-1
+e0e0a1c3d80f4fbf4bbd55066278e467b75df8a4 cubicweb-version-3_1_4
+0e132fbae9cc5e004f4b79a8b842addad43519a7 cubicweb-debian-version-3_1_4-1
diff -r af40e615dc89 -r fe1d2c243d52 __pkginfo__.py
--- a/__pkginfo__.py	Mon Apr 06 16:18:46 2009 +0200
+++ b/__pkginfo__.py	Mon Apr 06 18:44:15 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'
diff -r af40e615dc89 -r fe1d2c243d52 common/registerers.py
--- a/common/registerers.py	Mon Apr 06 16:18:46 2009 +0200
+++ b/common/registerers.py	Mon Apr 06 18:44:15 2009 +0200
@@ -101,6 +101,8 @@
     def equivalent(self, other):
         if _accepts_interfaces(self.vobject) != _accepts_interfaces(other):
             return False
+        if getattr(self.vobject, 'require_groups', ()) != getattr(other, 'require_groups', ()):
+            return False
         try:
             newaccepts = list(other.accepts)
             for etype in self.vobject.accepts:
diff -r af40e615dc89 -r fe1d2c243d52 cwvreg.py
--- a/cwvreg.py	Mon Apr 06 16:18:46 2009 +0200
+++ b/cwvreg.py	Mon Apr 06 18:44:15 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)
diff -r af40e615dc89 -r fe1d2c243d52 debian/changelog
--- a/debian/changelog	Mon Apr 06 16:18:46 2009 +0200
+++ b/debian/changelog	Mon Apr 06 18:44:15 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