refactor

Author: rnag

benchmarks/complex.py

@@ -17,11 +17,11 @@
 import mashumaro
 
 from dataclass_wizard import JSONWizard, LoadMeta
-from dataclass_wizard.class_helper import create_new_class
+from dataclass_wizard._type_utils import create_new_class
 from dataclass_wizard.constants import PY314_OR_ABOVE
 from dataclass_wizard.utils._string_case import to_snake_case
 # FIXME
-from dataclass_wizard.wizard_cli.schema import _as_datetime as as_datetime
+from dataclass_wizard.cli.schema import _as_datetime as as_datetime
 
 
 log = logging.getLogger(__name__)

benchmarks/nested.py

@@ -14,11 +14,11 @@
 import mashumaro
 
 from dataclass_wizard import JSONWizard, LoadMeta
-from dataclass_wizard.class_helper import create_new_class
+from dataclass_wizard._type_utils import create_new_class
 from dataclass_wizard.constants import PY314_OR_ABOVE
 from dataclass_wizard.utils._string_case import to_snake_case
 # FIXME
-from dataclass_wizard.wizard_cli.schema import (
+from dataclass_wizard.cli.schema import (
     _as_datetime as as_datetime,
     _as_date as as_date)
 

benchmarks/simple.py

@@ -14,7 +14,7 @@
 import mashumaro
 
 from dataclass_wizard import JSONWizard, LoadMeta
-from dataclass_wizard.class_helper import create_new_class
+from dataclass_wizard._type_utils import create_new_class
 from dataclass_wizard.constants import PY314_OR_ABOVE
 from dataclass_wizard.utils._string_case import to_snake_case
 

dataclass_wizard/wizard_cli/__init__.py dataclass_wizard/cli/__init__.pydataclass_wizard/wizard_cli/__init__.py renamed to dataclass_wizard/cli/__init__.py

@@ -7,10 +7,10 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
-   dataclass_wizard.environ
+   dataclass_wizard.cli
+   dataclass_wizard.mixins
    dataclass_wizard.utils
-   dataclass_wizard.v1
-   dataclass_wizard.wizard_cli
+   dataclass_wizard.v0
 
 Submodules
 ----------

dataclass_wizard/wizard_cli/cli.py dataclass_wizard/cli/cli.pydataclass_wizard/wizard_cli/cli.py renamed to dataclass_wizard/cli/cli.py

@@ -49,7 +49,7 @@ Documentation = "https://dcw.ritviknag.com"
 "Bug Tracker" = "https://github.com/rnag/dataclass-wizard/issues"
 
 [project.scripts]
-wiz = "dataclass_wizard.wizard_cli.cli:main"
+wiz = "dataclass_wizard.cli.cli:main"
 
 [project.optional-dependencies]
 dotenv = ["python-dotenv>=1,<2"]

dataclass_wizard/wizard_cli/schema.py dataclass_wizard/cli/schema.pydataclass_wizard/wizard_cli/schema.py renamed to dataclass_wizard/cli/schema.py

@@ -5,7 +5,7 @@
 import pytest
 from pytest_mock import MockerFixture
 
-from dataclass_wizard.wizard_cli import main, PyCodeGenerator
+from dataclass_wizard.cli import main, PyCodeGenerator
 from ..conftest import data_file_path
 
 
@@ -48,7 +48,7 @@ def _get_captured_py_code(capfd) -> str:
 
 @pytest.fixture
 def mock_path(mocker: MockerFixture):
-    return mocker.patch('dataclass_wizard.wizard_cli.schema.Path')
+    return mocker.patch('dataclass_wizard.cli.schema.Path')
 
 
 @pytest.fixture
@@ -58,7 +58,7 @@ def mock_stdin(mocker: MockerFixture):
 
 @pytest.fixture
 def mock_open(mocker: MockerFixture):
-    return mocker.patch('dataclass_wizard.wizard_cli.cli.open')
+    return mocker.patch('dataclass_wizard.cli.cli.open')
 
 
 def test_call_py_code_generator_with_file_name(mock_path):