diff --git a/mocket/__init__.py b/mocket/__init__.py index faac03e3..2279bf19 100644 --- a/mocket/__init__.py +++ b/mocket/__init__.py @@ -1,12 +1,25 @@ -from mocket.async_mocket import async_mocketize +import importlib +import sys + +from mocket.decorators.async_mocket import async_mocketize +from mocket.decorators.mocketizer import Mocketizer, mocketize from mocket.entry import MocketEntry from mocket.mocket import Mocket -from mocket.mocketizer import Mocketizer, mocketize from mocket.ssl.context import MocketSSLContext # NOTE this is here for backwards-compat to keep old import-paths working from mocket.ssl.context import MocketSSLContext as FakeSSLContext +sys.modules["mocket.mockhttp"] = importlib.import_module("mocket.mocks.mockhttp") +sys.modules["mocket.mockredis"] = importlib.import_module("mocket.mocks.mockredis") +sys.modules["mocket.async_mocket"] = importlib.import_module( + "mocket.decorators.async_mocket" +) +sys.modules["mocket.mocketizer"] = importlib.import_module( + "mocket.decorators.mocketizer" +) + + __all__ = ( "async_mocketize", "mocketize", diff --git a/mocket/decorators/__init__.py b/mocket/decorators/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/mocket/async_mocket.py b/mocket/decorators/async_mocket.py similarity index 89% rename from mocket/async_mocket.py rename to mocket/decorators/async_mocket.py index 709d225f..40b763ae 100644 --- a/mocket/async_mocket.py +++ b/mocket/decorators/async_mocket.py @@ -1,4 +1,4 @@ -from mocket.mocketizer import Mocketizer +from mocket.decorators.mocketizer import Mocketizer from mocket.utils import get_mocketize diff --git a/mocket/mocketizer.py b/mocket/decorators/mocketizer.py similarity index 100% rename from mocket/mocketizer.py rename to mocket/decorators/mocketizer.py diff --git a/mocket/mocks/__init__.py b/mocket/mocks/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/mocket/mockhttp.py b/mocket/mocks/mockhttp.py similarity index 100% rename from mocket/mockhttp.py rename to mocket/mocks/mockhttp.py diff --git a/mocket/mockredis.py b/mocket/mocks/mockredis.py similarity index 100% rename from mocket/mockredis.py rename to mocket/mocks/mockredis.py