From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 15 May 2011 23:30:13 +0000 (-0700)
Subject: Help 2to3 with a tricky three-argument raise statement
X-Git-Tag: v2.0.0~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=031dc6796b771a2d42649a5e759a1763b76d131c;p=thirdparty%2Ftornado.git

Help 2to3 with a tricky three-argument raise statement
---

diff --git a/tornado/testing.py b/tornado/testing.py
index a92f337f4..1b6ee9af0 100644
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -179,7 +179,12 @@ class AsyncTestCase(unittest.TestCase):
         assert self.__stopped
         self.__stopped = False
         if self.__failure is not None:
-            raise self.__failure[0], self.__failure[1], self.__failure[2]
+            # 2to3 isn't smart enough to convert three-argument raise
+            # statements correctly in some cases.
+            if isinstance(self.__failure[1], self.__failure[0]):
+                raise self.__failure[1], None, self.__failure[2]
+            else:
+                raise self.__failure[0], self.__failure[1], self.__failure[2]
         result = self.__stop_args
         self.__stop_args = None
         return result