# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1246894605 -7200
# Node ID 47b5236774a0cf3b1cfe75f6d4bd2ec989644ace
# Parent  139a354624ab1296098e857b01176601cc23846c# Parent  a198d877c7483cfc369f68499586a6096e78cf5a
merge

diff -r 139a354624ab -r 47b5236774a0 debian/changelog
--- a/debian/changelog	Mon Jul 06 17:36:20 2009 +0200
+++ b/debian/changelog	Mon Jul 06 17:36:45 2009 +0200
@@ -1,3 +1,10 @@
+cubicweb (3.3.3-2) unstable; urgency=low
+
+  * re-release with "from __future__ import with_statement" commented out to
+    avoid broken installation if 2.4 is installed
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Mon, 06 Jul 2009 17:33:15 +0200
+
 cubicweb (3.3.3-1) unstable; urgency=low
 
   * new upstream release
diff -r 139a354624ab -r 47b5236774a0 test/unittest_rset.py
--- a/test/unittest_rset.py	Mon Jul 06 17:36:20 2009 +0200
+++ b/test/unittest_rset.py	Mon Jul 06 17:36:45 2009 +0200
@@ -6,7 +6,7 @@
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses
 """
-from __future__ import with_statement
+#from __future__ import with_statement
 
 from logilab.common.testlib import TestCase, unittest_main
 
diff -r 139a354624ab -r 47b5236774a0 web/test/unittest_form.py
--- a/web/test/unittest_form.py	Mon Jul 06 17:36:20 2009 +0200
+++ b/web/test/unittest_form.py	Mon Jul 06 17:36:45 2009 +0200
@@ -5,7 +5,7 @@
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses
 """
-from __future__ import with_statement
+#from __future__ import with_statement
 
 from xml.etree.ElementTree import fromstring