From ec3435b22418d36a01c04d2098a70d71844a4c87 Mon Sep 17 00:00:00 2001
From: bmintz <bmintz@protonmail.com>
Date: Sat, 30 Jun 2018 02:14:05 -0500
Subject: [PATCH] Remove remaining asyncio.coroutine calls.
Also remove Client.async_event
---
discord/client.py | 7 -------
discord/guild.py | 6 ++----
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/discord/client.py b/discord/client.py
index 2e4e7b609..9bf6bc59f 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -787,13 +787,6 @@ class Client:
log.debug('%s has successfully been registered as an event', coro.__name__)
return coro
- def async_event(self, coro):
- """A shorthand decorator for :func:`asyncio.coroutine` + :meth:`event`."""
- if not asyncio.iscoroutinefunction(coro):
- coro = asyncio.coroutine(coro)
-
- return self.event(coro)
-
async def change_presence(self, *, activity=None, status=None, afk=False):
"""|coro|
diff --git a/discord/guild.py b/discord/guild.py
index 4c2fc1fa4..8f770b19a 100644
--- a/discord/guild.py
+++ b/discord/guild.py
@@ -25,7 +25,6 @@ DEALINGS IN THE SOFTWARE.
"""
import copy
-import asyncio
from collections import namedtuple, defaultdict
@@ -794,8 +793,7 @@ class Guild(Hashable):
await http.edit_guild(self.id, reason=reason, **fields)
- @asyncio.coroutine
- def get_ban(self, user):
+ async def get_ban(self, user):
"""|coro|
Retrieves the :class:`BanEntry` for a user, which is a namedtuple
@@ -824,7 +822,7 @@ class Guild(Hashable):
BanEntry
The BanEntry object for the specified user.
"""
- data = yield from self._state.http.get_ban(user.id, self.id)
+ data = await self._state.http.get_ban(user.id, self.id)
return BanEntry(
user=User(state=self._state, data=data['user']),
reason=data['reason']