Move new utilities to the util namespace

9 files changed, 23 insertions, 14 deletions

diff --git a/botcore/__init__.py b/botcore/__init__.py
index f32e6bf2..d910f393 100644
--- a/botcore/__init__.py
+++ b/botcore/__init__.py
@@ -1,16 +1,10 @@
 """Useful utilities and tools for discord bot development."""
 
-from botcore import (caching, channel, extensions, exts, loggers, members, regex, scheduling)
+from botcore import exts, utils
 
 __all__ = [
-    caching,
-    channel,
-    extensions,
     exts,
-    loggers,
-    members,
-    regex,
-    scheduling,
+    utils,
 ]
 
 __all__ = list(map(lambda module: module.__name__, __all__))
diff --git a/botcore/utils/__init__.py b/botcore/utils/__init__.py
new file mode 100644
index 00000000..554e8ad1
--- /dev/null
+++ b/botcore/utils/__init__.py
@@ -0,0 +1,15 @@
+"""Useful utilities and tools for discord bot development."""
+
+from botcore.utils import (caching, channel, extensions, loggers, members, regex, scheduling)
+
+__all__ = [
+    caching,
+    channel,
+    extensions,
+    loggers,
+    members,
+    regex,
+    scheduling,
+]
+
+__all__ = list(map(lambda module: module.__name__, __all__))
diff --git a/botcore/caching.py b/botcore/utils/caching.py
index ea71ed1d..ea71ed1d 100644
--- a/botcore/caching.py
+++ b/botcore/utils/caching.py
diff --git a/botcore/channel.py b/botcore/utils/channel.py
index b19b4f08..7e0fc387 100644
--- a/botcore/channel.py
+++ b/botcore/utils/channel.py
@@ -3,7 +3,7 @@
 import discord
 from discord.ext.commands import Bot
 
-from botcore import loggers
+from botcore.utils import loggers
 
 log = loggers.get_logger(__name__)
 
diff --git a/botcore/extensions.py b/botcore/utils/extensions.py
index c8f200ad..c8f200ad 100644
--- a/botcore/extensions.py
+++ b/botcore/utils/extensions.py
diff --git a/botcore/loggers.py b/botcore/utils/loggers.py
index ac1db920..ac1db920 100644
--- a/botcore/loggers.py
+++ b/botcore/utils/loggers.py
diff --git a/botcore/members.py b/botcore/utils/members.py
index 07b16ea3..abe7e5e1 100644
--- a/botcore/members.py
+++ b/botcore/utils/members.py
@@ -2,9 +2,9 @@ import typing
 
 import discord
 
-from botcore.loggers import get_logger
+from botcore.utils import loggers
 
-log = get_logger(__name__)
+log = loggers.get_logger(__name__)
 
 
 async def get_or_fetch_member(guild: discord.Guild, member_id: int) -> typing.Optional[discord.Member]:
diff --git a/botcore/regex.py b/botcore/utils/regex.py
index 036a5113..036a5113 100644
--- a/botcore/regex.py
+++ b/botcore/utils/regex.py
diff --git a/botcore/scheduling.py b/botcore/utils/scheduling.py
index 206e5e79..947df0d9 100644
--- a/botcore/scheduling.py
+++ b/botcore/utils/scheduling.py
@@ -7,7 +7,7 @@ import typing
 from datetime import datetime
 from functools import partial
 
-from botcore.loggers import get_logger
+from botcore.utils import loggers
 
 
 class Scheduler:
@@ -36,7 +36,7 @@ class Scheduler:
         """
         self.name = name
 
-        self._log = get_logger(f"{__name__}.{name}")
+        self._log = loggers.get_logger(f"{__name__}.{name}")
         self._scheduled_tasks: typing.Dict[typing.Hashable, asyncio.Task] = {}
 
     def __contains__(self, task_id: typing.Hashable) -> bool:
@@ -242,5 +242,5 @@ def _log_task_exception(task: asyncio.Task, *, suppressed_exceptions: typing.Tup
         exception = task.exception()
         # Log the exception if one exists.
         if exception and not isinstance(exception, suppressed_exceptions):
-            log = get_logger(__name__)
+            log = loggers.get_logger(__name__)
             log.error(f"Error in task {task.get_name()} {id(task)}!", exc_info=exception)