diff options
Diffstat (limited to 'discord')
| -rw-r--r-- | discord/abc.py | 2 | ||||
| -rw-r--r-- | discord/iterators.py | 20 | ||||
| -rw-r--r-- | discord/reaction.py | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/discord/abc.py b/discord/abc.py index 2b05c83c..29bc65b3 100644 --- a/discord/abc.py +++ b/discord/abc.py @@ -872,7 +872,7 @@ class Messageable(metaclass=abc.ABCMeta): iterator = channel.history(limit=200) while True: try: - message = yield from iterator.get() + message = yield from iterator.next() except discord.NoMoreItems: break else: diff --git a/discord/iterators.py b/discord/iterators.py index 1a2dc1b2..e6f5234b 100644 --- a/discord/iterators.py +++ b/discord/iterators.py @@ -56,7 +56,7 @@ class _AsyncIterator: def find(self, predicate): while True: try: - elem = yield from self.get() + elem = yield from self.next() except NoMoreItems: return None @@ -75,7 +75,7 @@ class _AsyncIterator: ret = [] while True: try: - item = yield from self.get() + item = yield from self.next() except NoMoreItems: return ret else: @@ -89,7 +89,7 @@ class _AsyncIterator: @asyncio.coroutine def __anext__(self): try: - msg = yield from self.get() + msg = yield from self.next() except NoMoreItems: raise StopAsyncIteration() else: @@ -104,9 +104,9 @@ class _MappedAsyncIterator(_AsyncIterator): self.func = func @asyncio.coroutine - def get(self): + def next(self): # this raises NoMoreItems and will propagate appropriately - item = yield from self.iterator.get() + item = yield from self.iterator.next() return (yield from maybe_coroutine(self.func, item)) class _FilteredAsyncIterator(_AsyncIterator): @@ -119,8 +119,8 @@ class _FilteredAsyncIterator(_AsyncIterator): self.predicate = predicate @asyncio.coroutine - def get(self): - getter = self.iterator.get + def next(self): + getter = self.iterator.next pred = self.predicate while True: # propagate NoMoreItems similar to _MappedAsyncIterator @@ -143,7 +143,7 @@ class ReactionIterator(_AsyncIterator): self.users = asyncio.Queue(loop=state.loop) @asyncio.coroutine - def get(self): + def next(self): if self.users.empty(): yield from self.fill_users() @@ -271,7 +271,7 @@ class HistoryIterator(_AsyncIterator): self._retrieve_messages = self._retrieve_messages_before_strategy @asyncio.coroutine - def get(self): + def next(self): if self.messages.empty(): yield from self.fill_messages() @@ -437,7 +437,7 @@ class AuditLogIterator(_AsyncIterator): return data.get('users', []), entries @asyncio.coroutine - def get(self): + def next(self): if self.entries.empty(): yield from self._fill() diff --git a/discord/reaction.py b/discord/reaction.py index 2491d1bf..5c7c3620 100644 --- a/discord/reaction.py +++ b/discord/reaction.py @@ -137,7 +137,7 @@ class Reaction: iterator = reaction.users() while True: try: - user = yield from iterator.get() + user = yield from iterator.next() except discord.NoMoreItems: break else: |