aboutsummaryrefslogtreecommitdiff
path: root/discord/client.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/client.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/client.py')
-rw-r--r--discord/client.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/discord/client.py b/discord/client.py
index 74bb941c..0318a984 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -24,20 +24,21 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
"""
-from . import __version__ as library_version
from .user import User
from .invite import Invite
from .object import Object
from .errors import *
-from .state import ConnectionState
from .permissions import Permissions, PermissionOverwrite
-from . import utils, compat
from .enums import ChannelType, Status
from .voice_client import VoiceClient
from .gateway import *
from .emoji import Emoji
from .http import HTTPClient
+import discord.utils
+import discord.compat
+import discord.state
+
import asyncio
import aiohttp
import websockets
@@ -141,11 +142,11 @@ class Client:
connector = options.pop('connector', None)
self.http = HTTPClient(connector, loop=self.loop)
- self.connection = ConnectionState(dispatch=self.dispatch,
- chunker=self.request_offline_members,
- syncer=self._syncer,
- http=self.http, loop=self.loop,
- **options)
+ self.connection = discord.state.ConnectionState(dispatch=self.dispatch,
+ chunker=self.request_offline_members,
+ syncer=self._syncer,
+ http=self.http, loop=self.loop,
+ **options)
self._closed = asyncio.Event(loop=self.loop)
self._is_logged_in = asyncio.Event(loop=self.loop)
@@ -287,7 +288,7 @@ class Client:
getattr(self, handler)(*args, **kwargs)
if hasattr(self, method):
- compat.create_task(self._run_event(method, *args, **kwargs), loop=self.loop)
+ discord.compat.create_task(self._run_event(method, *args, **kwargs), loop=self.loop)
@asyncio.coroutine
def on_error(self, event_method, *args, **kwargs):
@@ -937,7 +938,7 @@ class Client:
avatar = self.user.avatar
else:
if avatar_bytes is not None:
- avatar = utils._bytes_to_base64_data(avatar_bytes)
+ avatar = discord.utils._bytes_to_base64_data(avatar_bytes)
else:
avatar = None