Browse Source

Python3 import fixes.

pull/1/head
Rapptz 10 years ago
parent
commit
b7fc383013
  1. 14
      discord/__init__.py
  2. 12
      discord/client.py
  3. 2
      discord/message.py
  4. 1
      discord/permissions.py
  5. 4
      discord/server.py

14
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

12
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

2
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.

1
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.

4
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):

Loading…
Cancel
Save