aboutsummaryrefslogtreecommitdiff
path: root/discord/member.py
diff options
context:
space:
mode:
authorRapptz <[email protected]>2016-12-24 05:11:06 -0500
committerRapptz <[email protected]>2017-01-03 09:52:02 -0500
commit79a49f91458159564ae5a7696797829c6a848a5d (patch)
tree0b588b8c3ef275f47061e8da47e6ca8a88403080 /discord/member.py
parentRename MessageChannel.send_message to send and unify interface. (diff)
downloaddiscord.py-79a49f91458159564ae5a7696797829c6a848a5d.tar.xz
discord.py-79a49f91458159564ae5a7696797829c6a848a5d.zip
Absolute import some circular dependencies to appease Python 3.4.
Diffstat (limited to 'discord/member.py')
-rw-r--r--discord/member.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/discord/member.py b/discord/member.py
index 964c17df..99412a68 100644
--- a/discord/member.py
+++ b/discord/member.py
@@ -26,10 +26,10 @@ DEALINGS IN THE SOFTWARE.
import asyncio
+import discord.utils
from .user import User
from .game import Game
from .permissions import Permissions
-from . import utils
from .enums import Status, ChannelType, try_enum
from .colour import Colour
@@ -143,7 +143,7 @@ class Member:
def __init__(self, *, data, guild, state):
self._state = state
self._user = state.store_user(data['user'])
- self.joined_at = utils.parse_time(data.get('joined_at'))
+ self.joined_at = discord.utils.parse_time(data.get('joined_at'))
self.roles = data.get('roles', [])
self.status = Status.offline
game = data.get('game', {})
@@ -239,7 +239,7 @@ class Member:
return True
for role in message.role_mentions:
- has_role = utils.get(self.roles, id=role.id) is not None
+ has_role = discord.utils.get(self.roles, id=role.id) is not None
if has_role:
return True
@@ -439,7 +439,7 @@ class Member:
Adding roles failed.
"""
- new_roles = utils._unique(r for s in (self.roles[1:], roles) for r in s)
+ new_roles = discord.utils._unique(r for s in (self.roles[1:], roles) for r in s)
yield from self.edit(roles=new_roles)
@asyncio.coroutine