refactor: move converter.py to utils/

leandcesar · Jan 4, 2023 · 7b6d033 · 7b6d033
1 parent 991cdff
commit 7b6d033
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/wa_me/__init__.py b/wa_me/__init__.py
@@ -14,9 +14,9 @@
 from .context import Ctx  # NOQA
 from .core import errors  # NOQA
 from .core.client import Client  # NOQA
-from .core.converter import as_dict, from_dict  # NOQA
 from .core.errors import *  # NOQA
 from .core.http import Route, HTTPClient  # NOQA
+from .utils.converter import as_dict, from_dict  # NOQA
 from .utils.routine import Routine, routine  # NOQA
 from .utils.ttl_dict import TTLDict  # NOQA
 

diff --git a/wa_me/context.py b/wa_me/context.py
@@ -6,7 +6,7 @@
 
 from .classes import enums, events, messages, responses
 from .core.client import Client
-from .core.converter import as_dict, from_dict
+from .utils.converter import as_dict, from_dict
 
 __all__ = ("Ctx",)
 

diff --git a/wa_me/core/errors.py b/wa_me/core/errors.py
@@ -5,7 +5,7 @@
 import requests
 
 __all__ = (
-    "WhatsappException",
+    "WaMeException",
     "ValidationError",
     "HTTPException",
     "BadRequest",
@@ -16,15 +16,15 @@
 )
 
 
-class WhatsappException(Exception):
+class WaMeException(Exception):
     """Base exception class for wa_me."""
 
 
-class ValidationError(WhatsappException):
+class ValidationError(WaMeException):
     """An Exception that is raised when there is a Validation Error."""
 
 
-class HTTPException(WhatsappException):
+class HTTPException(WaMeException):
     """Exception that's raised when an HTTP request operation fails.
 
     Parameters

diff --git a/wa_me/core/converter.py → wa_me/utils/converter.py b/wa_me/core/converter.py → wa_me/utils/converter.py
@@ -6,8 +6,6 @@
 
 import dacite
 
-from .errors import ValidationError
-
 __all__ = ("as_dict", "from_dict")
 
 T = TypeVar("T")
@@ -45,10 +43,7 @@ def _as_dict(_data: Dict[str, Any]) -> Dict[str, Any]:
             if v is not None
         }
 
-    try:
-        return _as_dict(asdict(data))
-    except Exception as e:
-        raise ValidationError(e)
+    return _as_dict(asdict(data))
 
 
 def from_dict(data_class: Type[T], data: Dict[str, Any]) -> T:
@@ -81,7 +76,4 @@ def _from_dict(_data: Dict[str, Any]) -> Dict[str, Any]:
             for k, v in _data.items()
         }
 
-    try:
-        return dacite.from_dict(data_class=data_class, data=_from_dict(data), config=config)
-    except Exception as e:
-        raise ValidationError(e)
+    return dacite.from_dict(data_class=data_class, data=_from_dict(data), config=config)