diff options
| author | Rapptz <[email protected]> | 2015-08-28 16:55:40 -0400 |
|---|---|---|
| committer | Rapptz <[email protected]> | 2015-08-28 16:55:40 -0400 |
| commit | b7fc383013ce135216a958aa1f1a0cecceedbfae (patch) | |
| tree | d5db3dadd7af51e6ef4c54bc8b656336feb00f2e | |
| parent | Quick documentation fixes (diff) | |
| download | discord.py-b7fc383013ce135216a958aa1f1a0cecceedbfae.tar.xz discord.py-b7fc383013ce135216a958aa1f1a0cecceedbfae.zip | |
Python3 import fixes.
| -rw-r--r-- | discord/__init__.py | 14 | ||||
| -rw-r--r-- | discord/client.py | 12 | ||||
| -rw-r--r-- | discord/message.py | 2 | ||||
| -rw-r--r-- | discord/permissions.py | 1 | ||||
| -rw-r--r-- | discord/server.py | 4 |
5 files changed, 16 insertions, 17 deletions
diff --git a/discord/__init__.py b/discord/__init__.py index 84509c0f..ed28db0c 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 d538b973..334cb56c 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 0f7006cb..2f529e09 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 0f6016b5..e4383694 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 fe267f3c..9eaf96fc 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): |