exasol · tomuben · Mar 11, 2025 · Mar 11, 2025 · Mar 11, 2025 · Mar 11, 2025
diff --git a/doc/changes/unreleased.md b/doc/changes/unreleased.md
@@ -11,4 +11,5 @@
 
 ## Refactoring
 
- - #52: Enabled Type Checking for the Project
+ - #52: Enabled Type Checking for the Project
+ - #63: Removed legacy module
diff --git a/exasol/error/_error.py b/exasol/error/_error.py
@@ -1,4 +1,3 @@
-import warnings
 from dataclasses import dataclass
 from typing import (
     Any,
@@ -9,20 +8,17 @@
     Union,
 )
 
+from exasol.error import _exa_error
+from exasol.error._error_message_builder import (
+    ErrorMessageBuilder,
+    InvalidErrorCode,
+)
 from exasol.error._internal_errors import (
     INVALID_ERROR_CODE,
     LIBRARY_ERRORS,
     UNKNOWN_EXCEPTION_OCCURED,
 )
 
-with warnings.catch_warnings():
-    warnings.simplefilter("ignore")
-    from exasol_error_reporting_python import exa_error
-    from exasol_error_reporting_python.error_message_builder import (
-        ErrorMessageBuilder,
-        InvalidErrorCode,
-    )
-
 
 @dataclass(frozen=True)
 class Parameter:
@@ -40,7 +36,7 @@ def __init__(
     ) -> None:
         # This function maybe flattened into or moved out of the constructor in the future.
         def build_error(code, msg, mitigations, params) -> ErrorMessageBuilder:
-            builder = exa_error.ExaError.message_builder(code)
+            builder = _exa_error.ExaError.message_builder(code)
             builder.message(msg)
 
             for mitigation in mitigations:

diff --git a/...reporting_python/error_message_builder.py → exasol/error/_error_message_builder.py b/...reporting_python/error_message_builder.py → exasol/error/_error_message_builder.py
@@ -6,8 +6,8 @@
     Optional,
 )
 
-from exasol_error_reporting_python.parameters_mapper import ParametersMapper
-from exasol_error_reporting_python.placeholder_handler import PlaceholderHandler
+from exasol.error._parameters_mapper import ParametersMapper
+from exasol.error._placeholder_handler import PlaceholderHandler
 
 ERROR_CODE_FORMAT = "^[FEW]-[A-Z][A-Z0-9]+(-[A-Z][A-Z0-9]+)*-[0-9]+$"
 

diff --git a/exasol_error_reporting_python/exa_error.py → exasol/error/_exa_error.py b/exasol_error_reporting_python/exa_error.py → exasol/error/_exa_error.py
@@ -1,4 +1,4 @@
-from exasol_error_reporting_python.error_message_builder import ErrorMessageBuilder
+from exasol.error._error_message_builder import ErrorMessageBuilder
 
 
 class ExaError:

diff --git a/...ror_reporting_python/parameters_mapper.py → exasol/error/_parameters_mapper.py b/...ror_reporting_python/parameters_mapper.py → exasol/error/_parameters_mapper.py
@@ -5,7 +5,7 @@
     Optional,
 )
 
-from exasol_error_reporting_python.placeholder_handler import PlaceholderHandler
+from exasol.error._placeholder_handler import PlaceholderHandler
 
 
 class ParametersMapper:

diff --git a/exasol_error_reporting_python/placeholder.py → exasol/error/_placeholder.py b/exasol_error_reporting_python/placeholder.py → exasol/error/_placeholder.py
diff --git a/...r_reporting_python/placeholder_handler.py → exasol/error/_placeholder_handler.py b/...r_reporting_python/placeholder_handler.py → exasol/error/_placeholder_handler.py
@@ -4,7 +4,7 @@
     Iterable,
 )
 
-from exasol_error_reporting_python.placeholder import Placeholder
+from exasol.error._placeholder import Placeholder
 
 
 class PlaceholderHandler:

diff --git a/exasol_error_reporting_python/__init__.py b/exasol_error_reporting_python/__init__.py
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,7 @@
 [tool.poetry]
 name = "exasol-error-reporting"
 packages  = [
-    {include = "exasol"},
-    {include = "exasol_error_reporting_python"}
+    {include = "exasol"}
 ]
 version = "0.5.0"
 description = "Exasol Python Error Reporting"
@@ -42,8 +41,7 @@ ec = 'exasol.error._cli:main'
 [tool.coverage.run]
 relative_files = true
 source = [
-    "exasol",
-    "exasol_error_reporting_python",
+    "exasol"
 ]
 
 [tool.coverage.report]

diff --git a/test/unit/error_test.py b/test/unit/error_test.py
@@ -114,7 +114,7 @@ def test_exa_error_does_not_throw_error_on_invalid(data):
 def test_raising_message_builder(data):
     from unittest.mock import patch
 
-    from exasol_error_reporting_python.exa_error import ExaError as Error
+    from exasol.error._exa_error import ExaError as Error
 
     actual_impl = Error.message_builder
 
@@ -123,7 +123,7 @@ def builder(error_code):
             return actual_impl(error_code)
         raise Exception(f"{error_code}")
 
-    with patch("exasol_error_reporting_python.exa_error.ExaError") as mock:
+    with patch("exasol.error._exa_error.ExaError") as mock:
         mock.message_builder = builder
         error = ExaError(data.code, data.message, data.mitigations, data.parameters)
     actual = str(error)
@@ -135,12 +135,3 @@ def builder(error_code):
     """
     )
     assert expected in actual
-
-
-def test_using_the_old_api_produces_deprecation_warning():
-    with pytest.warns(DeprecationWarning):
-        # due to the fact that the exasol.error package already imports the package at an earlier stage
-        # we need to ensure the module is imported during the test itself.
-        import exasol_error_reporting_python
-
-        importlib.reload(exasol_error_reporting_python)
diff --git a/test/unit/legacy/test_error_code_format.py b/test/unit/legacy/test_error_code_format.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from exasol_error_reporting_python.error_message_builder import (
+from exasol.error._error_message_builder import (
     ErrorMessageBuilder,
     InvalidErrorCode,
 )

diff --git a/test/unit/legacy/test_error_message_builder.py b/test/unit/legacy/test_error_message_builder.py
@@ -1,4 +1,4 @@
-from exasol_error_reporting_python.error_message_builder import ErrorMessageBuilder
+from exasol.error._error_message_builder import ErrorMessageBuilder
 
 
 def test_message():

diff --git a/test/unit/legacy/test_exa_error.py b/test/unit/legacy/test_exa_error.py
@@ -1,4 +1,4 @@
-from exasol_error_reporting_python.exa_error import ExaError
+from exasol.error._exa_error import ExaError
 
 
 def test_message_builder():