Skip to content

Commit 387cef3

Browse files
authored
Merge pull request #23 from 2018-11-27/v3.0
3.0.3
2 parents 41b8f7c + 9e1da8e commit 387cef3

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

exceptionx/__init__.py

+19-18
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def error(self, msg: Any): ...
7272
ETypes: TypeAlias = \
7373
TypeVar('ETypes', Type[Exception], Tuple[Type[Exception], ...])
7474

75+
ELogger: TypeAlias = TypeVar('ELogger', HasWarningMethod, HasErrorMethod, '...')
7576
ECallback: TypeAlias = TypeVar('ECallback', bound=Callable[..., None])
7677

7778
WrappedClosure: TypeAlias = TypeVar('WrappedClosure', bound=Callable[..., Any])
@@ -108,15 +109,15 @@ def __getattr__(ename: str) -> Type[Error]:
108109
def TryExcept(
109110
etype: ETypes,
110111
*,
111-
emsg: Optional[str] = None,
112-
silent: Optional[bool] = None,
113-
raw: Optional[bool] = None,
114-
invert: Optional[bool] = None,
115-
last_tb: Optional[bool] = None,
116-
logger: Optional[HasErrorMethod] = None,
117-
ereturn: Optional[Any] = None,
118-
ecallback: Optional[ECallback] = None,
119-
eexit: Optional[bool] = None
112+
emsg: Optional[str] = None,
113+
silent: Optional[bool] = None,
114+
raw: Optional[bool] = None,
115+
invert: Optional[bool] = None,
116+
last_tb: Optional[bool] = None,
117+
logger: Optional[ELogger] = None,
118+
ereturn: Optional[Any] = None,
119+
ecallback: Optional[ECallback] = None,
120+
eexit: Optional[bool] = None
120121
) -> WrappedClosure:
121122
"""
122123
`TryExcept` is a decorator that handles exceptions raised by the function it
@@ -189,7 +190,7 @@ def Retry(
189190
raw: Optional[bool] = None,
190191
invert: Optional[bool] = None,
191192
last_tb: Optional[bool] = None,
192-
logger: Optional[HasWarningMethod] = None
193+
logger: Optional[ELogger] = None
193194
) -> WrappedClosure:
194195
"""
195196
`Retry` is a decorator that retries exceptions raised by the function it
@@ -272,14 +273,14 @@ def Retry(
272273
def TryContext(
273274
etype: ETypes,
274275
*,
275-
emsg: Optional[str] = None,
276-
silent: Optional[bool] = None,
277-
raw: Optional[bool] = None,
278-
invert: Optional[bool] = None,
279-
last_tb: Optional[bool] = None,
280-
logger: Optional[HasErrorMethod] = None,
281-
ecallback: Optional[ECallback] = None,
282-
eexit: Optional[bool] = None
276+
emsg: Optional[str] = None,
277+
silent: Optional[bool] = None,
278+
raw: Optional[bool] = None,
279+
invert: Optional[bool] = None,
280+
last_tb: Optional[bool] = None,
281+
logger: Optional[ELogger] = None,
282+
ecallback: Optional[ECallback] = None,
283+
eexit: Optional[bool] = None
283284
) -> None:
284285
"""
285286
`TryContext` is a context manager that handles exceptions raised within the

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setuptools.setup(
44
name='exceptionx',
5-
version='3.0.2',
5+
version='3.0.3',
66
author='Unnamed great master',
77
author_email='<[email protected]>',
88
license='MIT',

0 commit comments

Comments
 (0)