aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadir Chowdhury <[email protected]>2020-11-28 08:16:49 +0000
committerGitHub <[email protected]>2020-11-28 03:16:49 -0500
commit6b803acde4f6377b8ccad959350a61a3d524b619 (patch)
treeb7e573aeb48562dd567983eb6f2283e1cd3a0d0b
parentFix `UnboundLocalError` for editing `public_updates_channel` (diff)
downloaddiscord.py-6b803acde4f6377b8ccad959350a61a3d524b619.tar.xz
discord.py-6b803acde4f6377b8ccad959350a61a3d524b619.zip
[chore] Remove redundant imports
This also removes the historical patch for NullHandler implemented in bbf1c54, as it has been available since Python 3.1.
-rw-r--r--discord/__init__.py9
-rw-r--r--discord/abc.py2
-rw-r--r--discord/client.py2
-rw-r--r--discord/ext/commands/bot.py3
-rw-r--r--discord/guild.py3
-rw-r--r--discord/iterators.py2
-rw-r--r--discord/member.py2
-rw-r--r--discord/message.py1
-rw-r--r--discord/state.py2
-rw-r--r--discord/utils.py2
10 files changed, 6 insertions, 22 deletions
diff --git a/discord/__init__.py b/discord/__init__.py
index 802f4cae..1720f494 100644
--- a/discord/__init__.py
+++ b/discord/__init__.py
@@ -64,11 +64,4 @@ VersionInfo = namedtuple('VersionInfo', 'major minor micro releaselevel serial')
version_info = VersionInfo(major=1, minor=6, micro=0, releaselevel='alpha', serial=0)
-try:
- from logging import NullHandler
-except ImportError:
- class NullHandler(logging.Handler):
- def emit(self, record):
- pass
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/discord/abc.py b/discord/abc.py
index 559dbde8..84757fcb 100644
--- a/discord/abc.py
+++ b/discord/abc.py
@@ -32,7 +32,7 @@ import asyncio
from .iterators import HistoryIterator
from .context_managers import Typing
from .enums import ChannelType
-from .errors import InvalidArgument, ClientException, HTTPException
+from .errors import InvalidArgument, ClientException
from .permissions import PermissionOverwrite, Permissions
from .role import Role
from .invite import Invite
diff --git a/discord/client.py b/discord/client.py
index a5bb9c00..6f9cb80a 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -33,14 +33,12 @@ import traceback
import aiohttp
from .user import User, Profile
-from .asset import Asset
from .invite import Invite
from .template import Template
from .widget import Widget
from .guild import Guild
from .channel import _channel_factory
from .enums import ChannelType
-from .member import Member
from .mentions import AllowedMentions
from .errors import *
from .enums import Status, VoiceRegion
diff --git a/discord/ext/commands/bot.py b/discord/ext/commands/bot.py
index c858ab6a..2fc08fa2 100644
--- a/discord/ext/commands/bot.py
+++ b/discord/ext/commands/bot.py
@@ -30,12 +30,11 @@ import inspect
import importlib.util
import sys
import traceback
-import re
import types
import discord
-from .core import GroupMixin, Command
+from .core import GroupMixin
from .view import StringView
from .context import Context
from . import errors
diff --git a/discord/guild.py b/discord/guild.py
index 514de733..b781a360 100644
--- a/discord/guild.py
+++ b/discord/guild.py
@@ -30,14 +30,13 @@ from collections import namedtuple
from . import utils
from .role import Role
from .member import Member, VoiceState
-from .activity import create_activity
from .emoji import Emoji
from .errors import InvalidData
from .permissions import PermissionOverwrite
from .colour import Colour
from .errors import InvalidArgument, ClientException
from .channel import *
-from .enums import VoiceRegion, Status, ChannelType, try_enum, VerificationLevel, ContentFilter, NotificationLevel
+from .enums import VoiceRegion, ChannelType, try_enum, VerificationLevel, ContentFilter, NotificationLevel
from .mixins import Hashable
from .user import User
from .invite import Invite
diff --git a/discord/iterators.py b/discord/iterators.py
index b059ea51..34dcd412 100644
--- a/discord/iterators.py
+++ b/discord/iterators.py
@@ -28,7 +28,7 @@ import asyncio
import datetime
from .errors import NoMoreItems
-from .utils import DISCORD_EPOCH, time_snowflake, maybe_coroutine
+from .utils import time_snowflake, maybe_coroutine
from .object import Object
from .audit_logs import AuditLogEntry
diff --git a/discord/member.py b/discord/member.py
index 59bd7bda..904c76a3 100644
--- a/discord/member.py
+++ b/discord/member.py
@@ -34,7 +34,7 @@ from . import utils
from .user import BaseUser, User
from .activity import create_activity
from .permissions import Permissions
-from .enums import Status, try_enum, UserFlags, HypeSquadHouse
+from .enums import Status, try_enum
from .colour import Colour
from .object import Object
diff --git a/discord/message.py b/discord/message.py
index ddcb7257..fb033965 100644
--- a/discord/message.py
+++ b/discord/message.py
@@ -43,7 +43,6 @@ from .file import File
from .utils import escape_mentions
from .guild import Guild
from .mixins import Hashable
-from .mentions import AllowedMentions
from .sticker import Sticker
__all__ = (
diff --git a/discord/state.py b/discord/state.py
index 6650ba87..983577ab 100644
--- a/discord/state.py
+++ b/discord/state.py
@@ -30,7 +30,6 @@ import copy
import datetime
import itertools
import logging
-import math
import weakref
import warnings
import inspect
@@ -53,7 +52,6 @@ from .role import Role
from .enums import ChannelType, try_enum, Status
from . import utils
from .flags import Intents, MemberCacheFlags
-from .embeds import Embed
from .object import Object
from .invite import Invite
diff --git a/discord/utils.py b/discord/utils.py
index 56ac6699..fd24eaee 100644
--- a/discord/utils.py
+++ b/discord/utils.py
@@ -31,7 +31,6 @@ import unicodedata
from base64 import b64encode
from bisect import bisect_left
import datetime
-from email.utils import parsedate_to_datetime
import functools
from inspect import isawaitable as _isawaitable
from operator import attrgetter
@@ -40,7 +39,6 @@ import re
import warnings
from .errors import InvalidArgument
-from .object import Object
DISCORD_EPOCH = 1420070400000
MAX_ASYNCIO_SECONDS = 3456000