From b7fc383013ce135216a958aa1f1a0cecceedbfae Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Fri, 28 Aug 2015 16:55:40 -0400
Subject: [PATCH] Python3 import fixes.

---
 discord/__init__.py    | 14 +++++++-------
 discord/client.py      | 12 ++++++------
 discord/message.py     |  2 +-
 discord/permissions.py |  1 -
 discord/server.py      |  4 ++--
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/discord/__init__.py b/discord/__init__.py
index 84509c0fb..ed28db0c7 100644
--- a/discord/__init__.py
+++ b/discord/__init__.py
@@ -18,10 +18,10 @@ __copyright__ = 'Copyright 2015 Rapptz'
 __version__ = '0.4.0'
 __build__ = 0x004000
 
-from client import Client
-from user import User
-from channel import Channel, PrivateChannel
-from server import Server, Member, Permissions, Role
-from message import Message
-from errors import *
-from permissions import Permissions
+from .client import Client
+from .user import User
+from .channel import Channel, PrivateChannel
+from .server import Server, Member, Permissions, Role
+from .message import Message
+from .errors import *
+from .permissions import Permissions
diff --git a/discord/client.py b/discord/client.py
index d538b9736..334cb56c0 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -26,16 +26,16 @@ DEALINGS IN THE SOFTWARE.
 
 import requests
 import json, re, time, copy
-import endpoints
 from collections import deque
 from threading import Timer
 from ws4py.client.threadedclient import WebSocketClient
 from sys import platform as sys_platform
-from errors import InvalidEventName, InvalidDestination, GatewayNotFound
-from user import User
-from channel import Channel, PrivateChannel
-from server import Server, Member, Permissions, Role
-from message import Message
+from . import endpoints
+from .errors import InvalidEventName, InvalidDestination, GatewayNotFound
+from .user import User
+from .channel import Channel, PrivateChannel
+from .server import Server, Member, Permissions, Role
+from .message import Message
 
 def _null_event(*args, **kwargs):
     pass
diff --git a/discord/message.py b/discord/message.py
index 0f7006cb9..2f529e097 100644
--- a/discord/message.py
+++ b/discord/message.py
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
 
 import datetime
 import re
-from user import User
+from .user import User
 
 class Message(object):
     """Represents a message from Discord.
diff --git a/discord/permissions.py b/discord/permissions.py
index 0f6016b5d..e4383694f 100644
--- a/discord/permissions.py
+++ b/discord/permissions.py
@@ -24,7 +24,6 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
 
-
 class Permissions(object):
     """Wraps up the Discord permission value.
 
diff --git a/discord/server.py b/discord/server.py
index fe267f3c4..9eaf96fcf 100644
--- a/discord/server.py
+++ b/discord/server.py
@@ -24,8 +24,8 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
 
-from user import User
-from permissions import Permissions
+from .user import User
+from .permissions import Permissions
 import datetime, re
 
 class Role(object):