From 4ae8e816603ce8df6242dcd85174514972067448 Mon Sep 17 00:00:00 2001
From: Hornwitser <discord@hornwitser.no>
Date: Wed, 1 Aug 2018 11:36:46 +0200
Subject: [PATCH] [lint] Remove redundant exception variables

Use bare raise statement when reraising the exception that occured, and
remove unused exception variables.  Also remove a pointless exception
handler in discord.opus.
---
 discord/abc.py               |  4 ++--
 discord/ext/commands/core.py | 10 +++++-----
 discord/http.py              |  2 +-
 discord/opus.py              |  7 ++-----
 discord/voice_client.py      |  6 +++---
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/discord/abc.py b/discord/abc.py
index d85534f90..bc6df3185 100644
--- a/discord/abc.py
+++ b/discord/abc.py
@@ -978,12 +978,12 @@ class Connectable(metaclass=abc.ABCMeta):
 
         try:
             await voice.connect(reconnect=reconnect)
-        except asyncio.TimeoutError as e:
+        except asyncio.TimeoutError:
             try:
                 await voice.disconnect(force=True)
             except Exception:
                 # we don't care if disconnect failed because connection failed
                 pass
-            raise e # re-raise
+            raise # re-raise
 
         return voice
diff --git a/discord/ext/commands/core.py b/discord/ext/commands/core.py
index bcf2cd8a7..8e28159dc 100644
--- a/discord/ext/commands/core.py
+++ b/discord/ext/commands/core.py
@@ -260,15 +260,15 @@ class Command:
             elif isinstance(converter, converters.Converter):
                 ret = await converter.convert(ctx, argument)
                 return ret
-        except CommandError as e:
-            raise e
+        except CommandError:
+            raise
         except Exception as e:
             raise ConversionError(converter, e) from e
 
         try:
             return converter(argument)
-        except CommandError as e:
-            raise e
+        except CommandError:
+            raise
         except Exception as e:
             try:
                 name = converter.__name__
@@ -363,7 +363,7 @@ class Command:
             argument = quoted_word(view)
             try:
                 value = await self.do_conversion(ctx, converter, argument, param)
-            except CommandError as e:
+            except CommandError:
                 if not result:
                     if required:
                         raise
diff --git a/discord/http.py b/discord/http.py
index 6c2b548c6..93e9708d3 100644
--- a/discord/http.py
+++ b/discord/http.py
@@ -248,7 +248,7 @@ class HTTPClient:
             self._token(old_token, bot=old_bot)
             if e.response.status == 401:
                 raise LoginFailure('Improper token has been passed.') from e
-            raise e
+            raise
 
         return data
 
diff --git a/discord/opus.py b/discord/opus.py
index 6003ca7c8..36a178a7c 100644
--- a/discord/opus.py
+++ b/discord/opus.py
@@ -81,10 +81,7 @@ def libopus_loader(name):
 
     # register the functions...
     for item in exported_functions:
-        try:
-            func = getattr(lib, item[0])
-        except Exception as e:
-            raise e
+        func = getattr(lib, item[0])
 
         try:
             if item[1]:
@@ -110,7 +107,7 @@ try:
         _lib = libopus_loader(_filename)
     else:
         _lib = libopus_loader(ctypes.util.find_library('opus'))
-except Exception as e:
+except Exception:
     _lib = None
 
 def load_opus(name):
diff --git a/discord/voice_client.py b/discord/voice_client.py
index b519b981f..9d189af29 100644
--- a/discord/voice_client.py
+++ b/discord/voice_client.py
@@ -142,9 +142,9 @@ class VoiceClient:
 
         try:
             await asyncio.wait_for(self._handshake_complete.wait(), timeout=self.timeout, loop=self.loop)
-        except asyncio.TimeoutError as e:
+        except asyncio.TimeoutError:
             await self.terminate_handshake(remove=True)
-            raise e
+            raise
 
         log.info('Voice handshake complete. Endpoint found %s (IP: %s)', self.endpoint, self.endpoint_ip)
 
@@ -232,7 +232,7 @@ class VoiceClient:
 
                 if not reconnect:
                     await self.disconnect()
-                    raise e
+                    raise
 
                 retry = backoff.delay()
                 log.exception('Disconnected from voice... Reconnecting in %.2fs.', retry)