Skip to content

Commit

Permalink
Use ExtendedDebugLogger instead of logging.Logger where appropriate
Browse files Browse the repository at this point in the history
  • Loading branch information
njgheorghita committed Nov 21, 2019
1 parent 8e5abb8 commit 0f8ba4d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions eth_utils/decorators.py
Expand Up @@ -45,7 +45,7 @@ def _assert_hexstr_or_text_kwarg_is_text_type(**kwargs: T) -> None:
if not _hexstr_or_text_kwarg_is_text_type(**kwargs):
raise TypeError(
"Arguments passed as hexstr or text must be of text type. "
"Instead, value was: %r" % (repr(next(iter(list(kwargs.values())))))
"Instead, value was: %r" % (repr(next(list(kwargs.values()))))
)


Expand All @@ -57,7 +57,7 @@ def _validate_supported_kwarg(kwargs: Any) -> None:
)


def validate_conversion_arguments(to_wrap: Callable[..., Any]) -> Any:
def validate_conversion_arguments(to_wrap: Callable[..., T]) -> Callable[..., T]:
"""
Validates arguments for conversion functions.
- Only a single argument is present
Expand All @@ -66,7 +66,7 @@ def validate_conversion_arguments(to_wrap: Callable[..., Any]) -> Any:
"""

@functools.wraps(to_wrap)
def wrapper(*args: Any, **kwargs: Any) -> Any:
def wrapper(*args: Any, **kwargs: Any) -> T:
_assert_one_val(*args, **kwargs)
if kwargs:
_validate_supported_kwarg(kwargs)
Expand Down
6 changes: 3 additions & 3 deletions eth_utils/logging.py
@@ -1,7 +1,7 @@
import contextlib
import functools
import logging
from typing import Any, Callable, Dict, Iterator, Optional, Type, TypeVar
from typing import Any, Callable, Dict, Iterator, Optional, Type, TypeVar, cast

from .toolz import assoc

Expand Down Expand Up @@ -84,8 +84,8 @@ def get_logger(name: str, logger_class: Type[logging.Logger] = None) -> logging.
return logging.getLogger(name)


def get_extended_debug_logger(name: str) -> logging.Logger:
return get_logger(name, ExtendedDebugLogger)
def get_extended_debug_logger(name: str) -> ExtendedDebugLogger:
return cast(ExtendedDebugLogger, get_logger(name, ExtendedDebugLogger))


THasLoggerMeta = TypeVar("THasLoggerMeta", bound="HasLoggerMeta")
Expand Down

0 comments on commit 0f8ba4d

Please sign in to comment.