Clean up python

discord/ext/commands/context.py

@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
+
 from __future__ import annotations
 
 import inspect
@@ -60,10 +61,7 @@ T = TypeVar('T')
 BotT = TypeVar('BotT', bound="Union[Bot, AutoShardedBot]")
 CogT = TypeVar('CogT', bound="Cog")
 
-if TYPE_CHECKING:
-    P = ParamSpec('P')
-else:
-    P = TypeVar('P')
+P = ParamSpec('P') if TYPE_CHECKING else TypeVar('P')
 
 
 class Context(discord.abc.Messageable, Generic[BotT]):

discord/ext/commands/converter.py

@@ -353,15 +353,15 @@ class PartialMessageConverter(Converter[discord.PartialMessage]):
 
     @staticmethod
     def _resolve_channel(ctx, guild_id, channel_id) -> Optional[PartialMessageableChannel]:
-        if guild_id is not None:
-            guild = ctx.bot.get_guild(guild_id)
-            if guild is not None and channel_id is not None:
-                return guild._resolve_channel(channel_id)  # type: ignore
-            else:
-                return None
-        else:
+        if guild_id is None:
             return ctx.bot.get_channel(channel_id) if channel_id else ctx.channel
 
+        guild = ctx.bot.get_guild(guild_id)
+        if guild is not None and channel_id is not None:
+            return guild._resolve_channel(channel_id)  # type: ignore
+        else:
+            return None
+
     async def convert(self, ctx: Context, argument: str) -> discord.PartialMessage:
         guild_id, message_id, channel_id = self._get_id_matches(ctx, argument)
         channel = self._resolve_channel(ctx, guild_id, channel_id)
@@ -754,8 +754,8 @@ class GuildConverter(IDConverter[discord.Guild]):
         if result is None:
             result = discord.utils.get(ctx.bot.guilds, name=argument)
 
-            if result is None:
-                raise GuildNotFound(argument)
+        if result is None:
+            raise GuildNotFound(argument)
         return result
 
 
@@ -939,8 +939,7 @@ class clean_content(Converter[str]):
         def repl(match: re.Match) -> str:
             type = match[1]
             id = int(match[2])
-            transformed = transforms[type](id)
-            return transformed
+            return transforms[type](id)
 
         result = re.sub(r'<(@[!&]?|#)([0-9]{15,20})>', repl, argument)
         if self.escape_markdown:

discord/ext/commands/view.py

@@ -82,9 +82,7 @@ class StringView:
     def skip_string(self, string):
         strlen = len(string)
         if self.buffer[self.index:self.index + strlen] == string:
-            self.previous = self.index
-            self.index += strlen
-            return True
+            return self._return_index(strlen, True)
         return False
 
     def read_rest(self):
@@ -95,9 +93,7 @@ class StringView:
 
     def read(self, n):
         result = self.buffer[self.index:self.index + n]
-        self.previous = self.index
-        self.index += n
-        return result
+        return self._return_index(n, result)
 
     def get(self):
         try:
@@ -105,9 +101,12 @@ class StringView:
         except IndexError:
             result = None
 
+        return self._return_index(1, result)
+
+    def _return_index(self, arg0, arg1):
         self.previous = self.index
-        self.index += 1
-        return result
+        self.index += arg0
+        return arg1
 
     def get_word(self):
         pos = 0