# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1297957598 -3600
# Node ID 123947d4a875bb82b05a29d8d3ff8ba6d551ed7c
# Parent  d0f635d3a6bb3a7bb5f09078b24f9206751f716e# Parent  5d0be45ee69d45ccfedd98c5880f3ac47ad4f825
backport stable

diff -r d0f635d3a6bb -r 123947d4a875 server/migractions.py
--- a/server/migractions.py	Thu Feb 17 16:09:06 2011 +0100
+++ b/server/migractions.py	Thu Feb 17 16:46:38 2011 +0100
@@ -545,7 +545,7 @@
                 self.rqlexec('DELETE CWUniqueTogetherConstraint C '
                              'WHERE C constraint_of E, '
                              '      E eid %%(x)s,'
-                             '      %s' % ', '.join( restrictions),
+                             '      %s' % ', '.join(restrictions),
                              substs)
             for ut in unique_together - repo_unique_together:
                 rql, substs = ss.uniquetogether2rql(eschema, ut)
diff -r d0f635d3a6bb -r 123947d4a875 web/test/test_views.py
--- a/web/test/test_views.py	Thu Feb 17 16:09:06 2011 +0100
+++ b/web/test/test_views.py	Thu Feb 17 16:46:38 2011 +0100
@@ -20,11 +20,12 @@
 from cubicweb.devtools.testlib import CubicWebTC, AutoPopulateTest, AutomaticWebTest
 from cubicweb.view import AnyRsetView
 
-AutomaticWebTest.application_rql = [
-    'Any L,F WHERE E is CWUser, E login L, E firstname F',
-    'Any L,F,E WHERE E is CWUser, E login L, E firstname F',
-    'Any COUNT(X) WHERE X is CWUser',
-    ]
+class AutomaticWebTest(AutomaticWebTest):
+    application_rql = [
+        'Any L,F WHERE E is CWUser, E login L, E firstname F',
+        'Any L,F,E WHERE E is CWUser, E login L, E firstname F',
+        'Any COUNT(X) WHERE X is CWUser',
+        ]
 
 
 class SomeView(AnyRsetView):
diff -r d0f635d3a6bb -r 123947d4a875 web/test/test_windmill.py
--- a/web/test/test_windmill.py	Thu Feb 17 16:09:06 2011 +0100
+++ b/web/test/test_windmill.py	Thu Feb 17 16:46:38 2011 +0100
@@ -2,5 +2,7 @@
 from cubicweb.devtools.cwwindmill import (CubicWebWindmillUseCase,
                                           unittest_main)
 
+class CubicWebWindmillUseCase(CubicWebWindmillUseCase): pass
+
 if __name__ == '__main__':
     unittest_main()