Moved hikari.utilities to hikari.internal, moved event_stream to hika…

…ri package. (#253)

.flake8

@@ -24,9 +24,9 @@ ignore =
 per-file-ignores =
     hikari/__init__.py:              F401,F403
     hikari/events/__init__.py:       F401,F403
-    hikari/utilities/routes.py:      FS003
-    hikari/utilities/time.py:        FS003
     hikari/impl/stateless_cache.py:  R102
+    hikari/internal/routes.py:       FS003
+    hikari/internal/time.py:         FS003
     tests/hikari/*:                  FS003,S106,D106,D104,D103,D101,D100
 
 max-complexity = 20

hikari/api/chunker.py

@@ -33,12 +33,12 @@
 if typing.TYPE_CHECKING:
     import datetime
 
+    from hikari import event_stream
     from hikari import guilds
     from hikari import snowflakes
     from hikari import users as users_
     from hikari.api import shard as gateway_shard
     from hikari.events import shard_events
-    from hikari.utilities import event_stream
 
 
 class RequestInformation(typing.Protocol):

hikari/api/entity_factory.py

@@ -30,7 +30,7 @@
 import attr
 
 from hikari import undefined
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     from hikari import applications as application_models
@@ -48,7 +48,7 @@
     from hikari import users as user_models
     from hikari import voices as voice_models
     from hikari import webhooks as webhook_models
-    from hikari.utilities import data_binding
+    from hikari.internal import data_binding
 
 
 @attr_extensions.with_copy

hikari/api/event_dispatcher.py

@@ -29,8 +29,8 @@
 import typing
 
 if typing.TYPE_CHECKING:
+    from hikari import event_stream
     from hikari.events import base_events
-    from hikari.utilities import event_stream
 
     EventT_co = typing.TypeVar("EventT_co", bound=base_events.Event, covariant=True)
     EventT_inv = typing.TypeVar("EventT_inv", bound=base_events.Event)

hikari/api/event_factory.py

@@ -39,7 +39,7 @@
     from hikari.events import typing_events
     from hikari.events import user_events
     from hikari.events import voice_events
-    from hikari.utilities import data_binding
+    from hikari.internal import data_binding
 
 
 class EventFactory(typing.Protocol):

hikari/api/rest.py

@@ -52,7 +52,7 @@
     from hikari import voices
     from hikari import webhooks
     from hikari.api import special_endpoints
-    from hikari.utilities import time
+    from hikari.internal import time
 
 
 class ConnectorFactory(abc.ABC):

hikari/api/shard.py

@@ -28,7 +28,7 @@
 import typing
 
 from hikari import undefined
-from hikari.utilities import enums
+from hikari.internal import enums
 
 if typing.TYPE_CHECKING:
     import datetime

hikari/api/special_endpoints.py

@@ -41,7 +41,7 @@
     from hikari import permissions as permissions_
     from hikari import snowflakes
     from hikari import voices
-    from hikari.utilities import time
+    from hikari.internal import time
 
 
 class TypingIndicator(abc.ABC):

hikari/applications.py

@@ -42,9 +42,9 @@
 from hikari import guilds
 from hikari import snowflakes
 from hikari import urls
-from hikari.utilities import attr_extensions
-from hikari.utilities import enums
-from hikari.utilities import routes
+from hikari.internal import attr_extensions
+from hikari.internal import enums
+from hikari.internal import routes
 
 if typing.TYPE_CHECKING:
     from hikari import permissions as permissions_

hikari/audit_logs.py

@@ -47,9 +47,9 @@
 import attr
 
 from hikari import snowflakes
-from hikari.utilities import attr_extensions
-from hikari.utilities import collections
-from hikari.utilities import enums
+from hikari.internal import attr_extensions
+from hikari.internal import collections
+from hikari.internal import enums
 
 if typing.TYPE_CHECKING:
     from hikari import channels

hikari/channels.py

@@ -52,9 +52,9 @@
 from hikari import undefined
 from hikari import urls
 from hikari import users
-from hikari.utilities import attr_extensions
-from hikari.utilities import enums
-from hikari.utilities import routes
+from hikari.internal import attr_extensions
+from hikari.internal import enums
+from hikari.internal import routes
 
 if typing.TYPE_CHECKING:
     import datetime

hikari/config.py

@@ -37,8 +37,8 @@
 import attr
 import yarl
 
-from hikari.utilities import attr_extensions
-from hikari.utilities import data_binding
+from hikari.internal import attr_extensions
+from hikari.internal import data_binding
 
 _BASICAUTH_TOKEN_PREFIX: typing.Final[str] = "Basic"  # nosec
 _PROXY_AUTHENTICATION_HEADER: typing.Final[str] = "Proxy-Authentication"

hikari/embeds.py

@@ -46,7 +46,7 @@
 from hikari import errors
 from hikari import files
 from hikari import undefined
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     import concurrent.futures

hikari/emojis.py

@@ -34,8 +34,8 @@
 from hikari import files
 from hikari import snowflakes
 from hikari import urls
-from hikari.utilities import attr_extensions
-from hikari.utilities import routes
+from hikari.internal import attr_extensions
+from hikari.internal import routes
 
 if typing.TYPE_CHECKING:
     from hikari import traits

hikari/errors.py

@@ -53,15 +53,15 @@
 
 import attr
 
-from hikari.utilities import attr_extensions
-from hikari.utilities import enums
+from hikari.internal import attr_extensions
+from hikari.internal import enums
 
 if typing.TYPE_CHECKING:
     from hikari import intents as intents_
     from hikari import messages
     from hikari import snowflakes
-    from hikari.utilities import data_binding
-    from hikari.utilities import routes
+    from hikari.internal import data_binding
+    from hikari.internal import routes
 
 
 @attr_extensions.with_copy

hikari/events/base_events.py

@@ -40,7 +40,7 @@
 from hikari import intents
 from hikari import traits
 from hikari.api import shard as gateway_shard
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     import types

hikari/events/channel_events.py

@@ -54,7 +54,7 @@
 from hikari import traits
 from hikari.events import base_events
 from hikari.events import shard_events
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     import datetime

hikari/events/guild_events.py

@@ -46,7 +46,7 @@
 from hikari import intents
 from hikari.events import base_events
 from hikari.events import shard_events
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     from hikari import channels as channels_

hikari/events/lifetime_events.py

@@ -34,7 +34,7 @@
 import attr
 
 from hikari.events import base_events
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     from hikari import traits

hikari/events/member_events.py

@@ -38,7 +38,7 @@
 from hikari import traits
 from hikari.events import base_events
 from hikari.events import shard_events
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     from hikari import guilds

hikari/events/message_events.py

@@ -48,7 +48,7 @@
 from hikari import users
 from hikari.events import base_events
 from hikari.events import shard_events
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     from hikari import embeds as embeds_

hikari/events/reaction_events.py

@@ -49,7 +49,7 @@
 from hikari import intents
 from hikari.events import base_events
 from hikari.events import shard_events
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     from hikari import emojis

hikari/events/role_events.py

@@ -37,7 +37,7 @@
 from hikari import intents
 from hikari.events import base_events
 from hikari.events import shard_events
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     from hikari import guilds

hikari/events/shard_events.py

@@ -39,8 +39,8 @@
 import attr
 
 from hikari.events import base_events
-from hikari.utilities import attr_extensions
-from hikari.utilities import collections
+from hikari.internal import attr_extensions
+from hikari.internal import collections
 
 if typing.TYPE_CHECKING:
     from hikari import guilds

hikari/events/typing_events.py

@@ -39,7 +39,7 @@
 from hikari.api import special_endpoints
 from hikari.events import base_events
 from hikari.events import shard_events
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     import datetime

hikari/events/user_events.py

@@ -29,7 +29,7 @@
 import attr
 
 from hikari.events import shard_events
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     from hikari import traits

hikari/events/voice_events.py

@@ -37,7 +37,7 @@
 from hikari import intents
 from hikari.events import base_events
 from hikari.events import shard_events
-from hikari.utilities import attr_extensions
+from hikari.internal import attr_extensions
 
 if typing.TYPE_CHECKING:
     from hikari import snowflakes

hikari/files.py

@@ -59,9 +59,9 @@
 import aiohttp.client
 import attr
 
-from hikari.utilities import aio
-from hikari.utilities import net
-from hikari.utilities import time
+from hikari.internal import aio
+from hikari.internal import net
+from hikari.internal import time
 
 if typing.TYPE_CHECKING:
     import types

hikari/guilds.py

@@ -58,10 +58,10 @@
 from hikari import snowflakes
 from hikari import urls
 from hikari import users
-from hikari.utilities import attr_extensions
-from hikari.utilities import enums
-from hikari.utilities import flag
-from hikari.utilities import routes
+from hikari.internal import attr_extensions
+from hikari.internal import enums
+from hikari.internal import flag
+from hikari.internal import routes
 
 if typing.TYPE_CHECKING:
     import datetime

hikari/impl/bot.py

@@ -41,6 +41,7 @@
 
 from hikari import config
 from hikari import errors
+from hikari import event_stream
 from hikari import intents as intents_
 from hikari import presences
 from hikari import traits
@@ -59,10 +60,9 @@
 from hikari.impl import rest as rest_impl
 from hikari.impl import shard as shard_impl
 from hikari.impl import voice as voice_impl
-from hikari.utilities import aio
-from hikari.utilities import event_stream
-from hikari.utilities import time
-from hikari.utilities import ux
+from hikari.internal import aio
+from hikari.internal import time
+from hikari.internal import ux
 
 if typing.TYPE_CHECKING:
     from hikari.api import cache

hikari/impl/buckets.py

@@ -210,10 +210,10 @@
 import typing
 
 from hikari.impl import rate_limits
-from hikari.utilities import aio
-from hikari.utilities import routes
-from hikari.utilities import time
-from hikari.utilities import ux
+from hikari.internal import aio
+from hikari.internal import routes
+from hikari.internal import time
+from hikari.internal import ux
 
 if typing.TYPE_CHECKING:
     import types

hikari/impl/entity_factory.py

@@ -50,9 +50,9 @@
 from hikari import voices as voice_models
 from hikari import webhooks as webhook_models
 from hikari.api import entity_factory
-from hikari.utilities import attr_extensions
-from hikari.utilities import data_binding
-from hikari.utilities import time
+from hikari.internal import attr_extensions
+from hikari.internal import data_binding
+from hikari.internal import time
 
 _DEFAULT_MAX_PRESENCES: typing.Final[int] = 25000
 

hikari/impl/event_factory.py

@@ -45,9 +45,9 @@
 from hikari.events import typing_events
 from hikari.events import user_events
 from hikari.events import voice_events
-from hikari.utilities import collections
-from hikari.utilities import data_binding
-from hikari.utilities import time
+from hikari.internal import collections
+from hikari.internal import data_binding
+from hikari.internal import time
 
 
 class EventFactoryImpl(event_factory.EventFactory):

hikari/impl/event_manager_base.py

@@ -32,14 +32,14 @@
 import warnings
 
 from hikari import errors
+from hikari import event_stream
 from hikari import intents as intents_
 from hikari import traits
 from hikari.api import event_dispatcher
 from hikari.events import base_events
-from hikari.utilities import aio
-from hikari.utilities import data_binding
-from hikari.utilities import event_stream
-from hikari.utilities import reflect
+from hikari.internal import aio
+from hikari.internal import data_binding
+from hikari.internal import reflect
 
 if typing.TYPE_CHECKING:
     from hikari.api import shard as gateway_shard