From d26b0bc19bf2666810c4ad0b14c03edf60c6ee3b Mon Sep 17 00:00:00 2001
From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
Date: Thu, 20 Jan 2022 21:12:59 +0100
Subject: [PATCH] test_replaygain: fix complicated and incorrect exception
 handling

This is an incorrect translation of a python 2 reraise to python 3.
With python 3, however, we can just rely on exception chaining to get
the traceback, so get rid of the complicated re-raising entirely, with
the additional benefit that the exception from the tear-down is also
shown.
---
 test/test_replaygain.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/test/test_replaygain.py b/test/test_replaygain.py
index b39a4e990..58b487fad 100644
--- a/test/test_replaygain.py
+++ b/test/test_replaygain.py
@@ -55,18 +55,8 @@ class ReplayGainCliTestBase(TestHelper):
         try:
             self.load_plugins('replaygain')
         except Exception:
-            import sys
-            # store exception info so an error in teardown does not swallow it
-            exc_info = sys.exc_info()
-            try:
-                self.teardown_beets()
-                self.unload_plugins()
-            except Exception:
-                # if load_plugins() failed then setup is incomplete and
-                # teardown operations may fail. In particular # {Item,Album}
-                # may not have the _original_types attribute in unload_plugins
-                pass
-            raise None.with_traceback(exc_info[2])
+            self.teardown_beets()
+            self.unload_plugins()
 
         album = self.add_album_fixture(2)
         for item in album.items():