Commit 7a0a3a64 authored by Krzysztof Jurewicz's avatar Krzysztof Jurewicz Committed by Baptiste Mispelon
Browse files

Fixed #21509 -- Removed dead exception catching code. 

Since Python 2.5, KeyboardInterrupt and SystemExit are not subclasses of
Exception, so explicitly reraising them before the “except Exception” clause
is not necessary anymore.
parent 7349a22d

django/test/testcases.py

+0 −4
Original line number Diff line number Diff line
@@ -175,8 +175,6 @@ class SimpleTestCase(unittest.TestCase): 
        if not skipped:

            try:

                self._pre_setup()

            except (KeyboardInterrupt, SystemExit):

                raise

            except Exception:

                result.addError(self, sys.exc_info())

                return
@@ -184,8 +182,6 @@ class SimpleTestCase(unittest.TestCase): 
        if not skipped:

            try:

                self._post_teardown()

            except (KeyboardInterrupt, SystemExit):

                raise

            except Exception:

                result.addError(self, sys.exc_info())

                return