Clean up python

discord/__main__.py

@@ -32,9 +32,13 @@ import aiohttp
 import platform
 
 def show_version():
-    entries = []
+    entries = [
+        '- Python v{0.major}.{0.minor}.{0.micro}-{0.releaselevel}'.format(
+            sys.version_info
+        )
+    ]
+
 
-    entries.append('- Python v{0.major}.{0.minor}.{0.micro}-{0.releaselevel}'.format(sys.version_info))
     version_info = discord.version_info
     entries.append('- discord.py v{0.major}.{0.minor}.{0.micro}-{0.releaselevel}'.format(version_info))
     if version_info.releaselevel != 'final':

discord/activity.py

@@ -794,13 +794,13 @@ class CustomActivity(BaseActivity):
         return hash((self.name, str(self.emoji)))
 
     def __str__(self) -> str:
-        if self.emoji:
+        if not self.emoji:
-            if self.name:
-                return f'{self.emoji} {self.name}'
-            return str(self.emoji)
-        else:
             return str(self.name)
 
+        if self.name:
+            return f'{self.emoji} {self.name}'
+        return str(self.emoji)
+
     def __repr__(self) -> str:
         return f'<CustomActivity name={self.name!r} emoji={self.emoji!r}>'
 

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') if TYPE_CHECKING else TypeVar('P')
-    P = ParamSpec('P')
-else:
-    P = 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:
+        if guild_id is 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:
             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:
+        if result is None:
-                raise GuildNotFound(argument)
+            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 transforms[type](id)
-            return transformed
 
         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
+            return self._return_index(strlen, True)
-            self.index += strlen
-            return 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
+        return self._return_index(n, result)
-        self.index += n
-        return 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
+        self.index += arg0
-        return result
+        return arg1
 
     def get_word(self):
         pos = 0

discord/ext/tasks/__init__.py

@@ -488,11 +488,7 @@ class Loop(Generic[LF]):
             The function was not a coroutine.
         """
 
-        if not inspect.iscoroutinefunction(coro):
+        return self._raise_expected_coro(coro)
-            raise TypeError(f'Expected coroutine function, received {coro.__class__.__name__!r}.')
-
-        self._before_loop = coro
-        return coro
 
     def after_loop(self, coro: FT) -> FT:
         """A decorator that register a coroutine to be called after the loop finished running.
@@ -516,11 +512,7 @@ class Loop(Generic[LF]):
             The function was not a coroutine.
         """
 
-        if not inspect.iscoroutinefunction(coro):
+        return self._raise_expected_coro(coro)
-            raise TypeError(f'Expected coroutine function, received {coro.__class__.__name__!r}.')
-
-        self._after_loop = coro
-        return coro
 
     def error(self, coro: ET) -> ET:
         """A decorator that registers a coroutine to be called if the task encounters an unhandled exception.
@@ -542,10 +534,14 @@ class Loop(Generic[LF]):
         TypeError
             The function was not a coroutine.
         """
-        if not inspect.iscoroutinefunction(coro):
+        return self._raise_expected_coro(coro)
-            raise TypeError(f'Expected coroutine function, received {coro.__class__.__name__!r}.')
+
+    def _raise_expected_coro(self, coro):
+        if not inspect.iscoroutinefunction(coro):
+            raise TypeError(
+                f'Expected coroutine function, received {coro.__class__.__name__!r}.'
+            )
 
-        self._error = coro  # type: ignore
         return coro
 
     def _get_next_sleep_time(self) -> datetime.datetime:
@@ -614,8 +610,7 @@ class Loop(Generic[LF]):
                 )
             ret.append(t if t.tzinfo is not None else t.replace(tzinfo=utc))
 
-        ret = sorted(set(ret))  # de-dupe and sort times
+        return sorted(set(ret))
-        return ret
 
     def change_interval(
         self,

discord/player.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 threading
@@ -63,10 +64,7 @@ __all__ = (
 
 CREATE_NO_WINDOW: int
 
-if sys.platform != 'win32':
+CREATE_NO_WINDOW = 0 if sys.platform != 'win32' else 0x08000000
-    CREATE_NO_WINDOW = 0
-else:
-    CREATE_NO_WINDOW = 0x08000000
 
 class AudioSource:
     """Represents an audio stream.
@@ -526,7 +524,12 @@ class FFmpegOpusAudio(FFmpegAudio):
 
     @staticmethod
     def _probe_codec_native(source, executable: str = 'ffmpeg') -> Tuple[Optional[str], Optional[int]]:
-        exe = executable[:2] + 'probe' if executable in ('ffmpeg', 'avconv') else executable
+        exe = (
+            executable[:2] + 'probe'
+            if executable in {'ffmpeg', 'avconv'}
+            else executable
+        )
+
         args = [exe, '-v', 'quiet', '-print_format', 'json', '-show_streams', '-select_streams', 'a:0', source]
         output = subprocess.check_output(args, timeout=20)
         codec = bitrate = None

discord/ui/button.py

@@ -185,16 +185,16 @@ class Button(Item[V]):
 
     @emoji.setter
     def emoji(self, value: Optional[Union[str, Emoji, PartialEmoji]]):  # type: ignore
-        if value is not None:
+        if value is None:
-            if isinstance(value, str):
-                self._underlying.emoji = PartialEmoji.from_str(value)
-            elif isinstance(value, _EmojiTag):
-                self._underlying.emoji = value._to_partial()
-            else:
-                raise TypeError(f'expected str, Emoji, or PartialEmoji, received {value.__class__} instead')
-        else:
             self._underlying.emoji = None
 
+        elif isinstance(value, str):
+            self._underlying.emoji = PartialEmoji.from_str(value)
+        elif isinstance(value, _EmojiTag):
+            self._underlying.emoji = value._to_partial()
+        else:
+            raise TypeError(f'expected str, Emoji, or PartialEmoji, received {value.__class__} instead')
+
     @classmethod
     def from_component(cls: Type[B], button: ButtonComponent) -> B:
         return cls(