merge stable
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Tue, 20 Oct 2009 17:13:05 +0200
branchstable
changeset 3759 e68b8e0143b1
parent 3758 d43c9709434d (current diff)
parent 3757 122a01751d59 (diff)
child 3760 9d93faa0e6dc
merge
--- a/entities/wfobjs.py	Tue Oct 20 17:11:52 2009 +0200
+++ b/entities/wfobjs.py	Tue Oct 20 17:13:05 2009 +0200
@@ -11,6 +11,7 @@
 
 from logilab.common.decorators import cached, clear_cache
 from logilab.common.deprecation import deprecated
+from logilab.common.compat import any
 
 from cubicweb.entities import AnyEntity, fetch_config
 from cubicweb.interfaces import IWorkflowable
--- a/selectors.py	Tue Oct 20 17:11:52 2009 +0200
+++ b/selectors.py	Tue Oct 20 17:13:05 2009 +0200
@@ -45,7 +45,7 @@
 import logging
 from warnings import warn, filterwarnings
 
-from logilab.common.compat import all
+from logilab.common.compat import all, any
 from logilab.common.deprecation import deprecated
 from logilab.common.interface import implements as implements_iface
 
--- a/server/repository.py	Tue Oct 20 17:11:52 2009 +0200
+++ b/server/repository.py	Tue Oct 20 17:13:05 2009 +0200
@@ -24,6 +24,7 @@
 from time import time, localtime, strftime
 
 from logilab.common.decorators import cached
+from logilab.common.compat import any
 
 from yams import BadSchemaDefinition
 from rql import RQLSyntaxError
--- a/web/test/unittest_form.py	Tue Oct 20 17:11:52 2009 +0200
+++ b/web/test/unittest_form.py	Tue Oct 20 17:13:05 2009 +0200
@@ -10,6 +10,7 @@
 from xml.etree.ElementTree import fromstring
 
 from logilab.common.testlib import unittest_main, mock_object
+from logilab.common.compat import any
 
 from cubicweb import Binary
 from cubicweb.devtools.testlib import WebTest
--- a/web/test/unittest_views_editforms.py	Tue Oct 20 17:11:52 2009 +0200
+++ b/web/test/unittest_views_editforms.py	Tue Oct 20 17:13:05 2009 +0200
@@ -6,6 +6,7 @@
 :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses
 """
 from logilab.common.testlib import unittest_main
+from logilab.common.compat import any
 from cubicweb.devtools.apptest import EnvBasedTC
 from cubicweb.devtools.testlib import WebTest
 from cubicweb.web.views.autoform import AutomaticEntityForm as AEF