aboutsummaryrefslogtreecommitdiff
path: root/discord/__init__.py
diff options
context:
space:
mode:
authorRapptz <[email protected]>2016-10-17 18:25:23 -0400
committerRapptz <[email protected]>2017-01-03 09:51:54 -0500
commitd1d54a468a88323a8ef7798ff084a1371d5893ec (patch)
tree21dd315df95acd2c8d6cf63cc51fa4cadc0c7155 /discord/__init__.py
parentStateful Message and remove Invite.xkcd since it is removed. (diff)
downloaddiscord.py-d1d54a468a88323a8ef7798ff084a1371d5893ec.tar.xz
discord.py-d1d54a468a88323a8ef7798ff084a1371d5893ec.zip
Rename Server to Guild everywhere.
Diffstat (limited to 'discord/__init__.py')
-rw-r--r--discord/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/discord/__init__.py b/discord/__init__.py
index 55427cca..4806ffbd 100644
--- a/discord/__init__.py
+++ b/discord/__init__.py
@@ -22,7 +22,7 @@ from .user import User
from .game import Game
from .emoji import Emoji
from .channel import *
-from .server import Server
+from .guild import Guild
from .member import Member, VoiceState
from .message import Message
from .errors import *
@@ -35,7 +35,7 @@ from .object import Object
from .reaction import Reaction
from . import utils, opus, compat, abc
from .voice_client import VoiceClient
-from .enums import ChannelType, ServerRegion, Status, MessageType, VerificationLevel
+from .enums import ChannelType, GuildRegion, Status, MessageType, VerificationLevel
from collections import namedtuple
from .embeds import Embed