[Python-modules-commits] r12264 - in packages/epsilon/trunk/debian (3 files)

[bernat at users.alioth.debian.org]

    Date: Sunday, March 14, 2010 @ 11:13:23
  Author: bernat
Revision: 12264

Fix another FTBFS due to setUpClass being removed from Twisted
Trial. Closes: #573695.

Added:
  packages/epsilon/trunk/debian/patches/dont-use-setupclass.diff
Modified:
  packages/epsilon/trunk/debian/changelog
  packages/epsilon/trunk/debian/patches/series

Modified: packages/epsilon/trunk/debian/changelog
===================================================================
--- packages/epsilon/trunk/debian/changelog	2010-03-14 10:03:02 UTC (rev 12263)
+++ packages/epsilon/trunk/debian/changelog	2010-03-14 11:13:23 UTC (rev 12264)
@@ -1,3 +1,10 @@
+epsilon (0.6.0-3) unstable; urgency=low
+
+  * Fix another FTBFS due to setUpClass being removed from Twisted
+    Trial. Closes: #573695.
+
+ -- Vincent Bernat <bernat at debian.org>  Sun, 14 Mar 2010 12:08:33 +0100
+
 epsilon (0.6.0-2) unstable; urgency=low
 
   [ Jakub Wilk ]

Added: packages/epsilon/trunk/debian/patches/dont-use-setupclass.diff
===================================================================
--- packages/epsilon/trunk/debian/patches/dont-use-setupclass.diff	                        (rev 0)
+++ packages/epsilon/trunk/debian/patches/dont-use-setupclass.diff	2010-03-14 11:13:23 UTC (rev 12264)
@@ -0,0 +1,16 @@
+Fix for #573695.
+
+Using setUp instead of setUpClass works just fine. The initialization is done for
+each test, but everything seems to work.
+
+--- a/epsilon/test/test_sslverify.py~	2008-08-13 16:37:06.000000000 +0200
++++ a/epsilon/test/test_sslverify.py	2010-03-14 12:09:22.000000000 +0100
+@@ -83,7 +83,7 @@
+             message="Use twisted.internet.ssl instead of epsilon.sslverify.",
+             category=DeprecationWarning)]
+ 
+-    def setUpClass(self):
++    def setUp(self):
+         # Import the module here so that the warning emitted at import time
+         # gets suppressed.  Modify a global instead of setting an attribute
+         # or some other such nice thing so as not to have to change a bunch

Modified: packages/epsilon/trunk/debian/patches/series
===================================================================
--- packages/epsilon/trunk/debian/patches/series	2010-03-14 10:03:02 UTC (rev 12263)
+++ packages/epsilon/trunk/debian/patches/series	2010-03-14 11:13:23 UTC (rev 12264)
@@ -1,3 +1,4 @@
 use-proc-mounts.diff
 fix-test_cmp.diff
 python-2.6.diff
+dont-use-setupclass.diff