[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.
This commit is contained in:
		@@ -978,12 +978,12 @@ class Connectable(metaclass=abc.ABCMeta):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            await voice.connect(reconnect=reconnect)
 | 
					            await voice.connect(reconnect=reconnect)
 | 
				
			||||||
        except asyncio.TimeoutError as e:
 | 
					        except asyncio.TimeoutError:
 | 
				
			||||||
            try:
 | 
					            try:
 | 
				
			||||||
                await voice.disconnect(force=True)
 | 
					                await voice.disconnect(force=True)
 | 
				
			||||||
            except Exception:
 | 
					            except Exception:
 | 
				
			||||||
                # we don't care if disconnect failed because connection failed
 | 
					                # we don't care if disconnect failed because connection failed
 | 
				
			||||||
                pass
 | 
					                pass
 | 
				
			||||||
            raise e # re-raise
 | 
					            raise # re-raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return voice
 | 
					        return voice
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -260,15 +260,15 @@ class Command:
 | 
				
			|||||||
            elif isinstance(converter, converters.Converter):
 | 
					            elif isinstance(converter, converters.Converter):
 | 
				
			||||||
                ret = await converter.convert(ctx, argument)
 | 
					                ret = await converter.convert(ctx, argument)
 | 
				
			||||||
                return ret
 | 
					                return ret
 | 
				
			||||||
        except CommandError as e:
 | 
					        except CommandError:
 | 
				
			||||||
            raise e
 | 
					            raise
 | 
				
			||||||
        except Exception as e:
 | 
					        except Exception as e:
 | 
				
			||||||
            raise ConversionError(converter, e) from e
 | 
					            raise ConversionError(converter, e) from e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            return converter(argument)
 | 
					            return converter(argument)
 | 
				
			||||||
        except CommandError as e:
 | 
					        except CommandError:
 | 
				
			||||||
            raise e
 | 
					            raise
 | 
				
			||||||
        except Exception as e:
 | 
					        except Exception as e:
 | 
				
			||||||
            try:
 | 
					            try:
 | 
				
			||||||
                name = converter.__name__
 | 
					                name = converter.__name__
 | 
				
			||||||
@@ -363,7 +363,7 @@ class Command:
 | 
				
			|||||||
            argument = quoted_word(view)
 | 
					            argument = quoted_word(view)
 | 
				
			||||||
            try:
 | 
					            try:
 | 
				
			||||||
                value = await self.do_conversion(ctx, converter, argument, param)
 | 
					                value = await self.do_conversion(ctx, converter, argument, param)
 | 
				
			||||||
            except CommandError as e:
 | 
					            except CommandError:
 | 
				
			||||||
                if not result:
 | 
					                if not result:
 | 
				
			||||||
                    if required:
 | 
					                    if required:
 | 
				
			||||||
                        raise
 | 
					                        raise
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -248,7 +248,7 @@ class HTTPClient:
 | 
				
			|||||||
            self._token(old_token, bot=old_bot)
 | 
					            self._token(old_token, bot=old_bot)
 | 
				
			||||||
            if e.response.status == 401:
 | 
					            if e.response.status == 401:
 | 
				
			||||||
                raise LoginFailure('Improper token has been passed.') from e
 | 
					                raise LoginFailure('Improper token has been passed.') from e
 | 
				
			||||||
            raise e
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return data
 | 
					        return data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -81,10 +81,7 @@ def libopus_loader(name):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    # register the functions...
 | 
					    # register the functions...
 | 
				
			||||||
    for item in exported_functions:
 | 
					    for item in exported_functions:
 | 
				
			||||||
        try:
 | 
					        func = getattr(lib, item[0])
 | 
				
			||||||
            func = getattr(lib, item[0])
 | 
					 | 
				
			||||||
        except Exception as e:
 | 
					 | 
				
			||||||
            raise e
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            if item[1]:
 | 
					            if item[1]:
 | 
				
			||||||
@@ -110,7 +107,7 @@ try:
 | 
				
			|||||||
        _lib = libopus_loader(_filename)
 | 
					        _lib = libopus_loader(_filename)
 | 
				
			||||||
    else:
 | 
					    else:
 | 
				
			||||||
        _lib = libopus_loader(ctypes.util.find_library('opus'))
 | 
					        _lib = libopus_loader(ctypes.util.find_library('opus'))
 | 
				
			||||||
except Exception as e:
 | 
					except Exception:
 | 
				
			||||||
    _lib = None
 | 
					    _lib = None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def load_opus(name):
 | 
					def load_opus(name):
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -142,9 +142,9 @@ class VoiceClient:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            await asyncio.wait_for(self._handshake_complete.wait(), timeout=self.timeout, loop=self.loop)
 | 
					            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)
 | 
					            await self.terminate_handshake(remove=True)
 | 
				
			||||||
            raise e
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        log.info('Voice handshake complete. Endpoint found %s (IP: %s)', self.endpoint, self.endpoint_ip)
 | 
					        log.info('Voice handshake complete. Endpoint found %s (IP: %s)', self.endpoint, self.endpoint_ip)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -232,7 +232,7 @@ class VoiceClient:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                if not reconnect:
 | 
					                if not reconnect:
 | 
				
			||||||
                    await self.disconnect()
 | 
					                    await self.disconnect()
 | 
				
			||||||
                    raise e
 | 
					                    raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                retry = backoff.delay()
 | 
					                retry = backoff.delay()
 | 
				
			||||||
                log.exception('Disconnected from voice... Reconnecting in %.2fs.', retry)
 | 
					                log.exception('Disconnected from voice... Reconnecting in %.2fs.', retry)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user