Don't prepend exception name for WK generic types
This commit is contained in:
parent
528602d98e
commit
8289df1d62
1 changed files with 7 additions and 6 deletions
|
|
@ -442,10 +442,11 @@ class TryAndPrint():
|
|||
pass
|
||||
|
||||
# Prepend exception name
|
||||
try:
|
||||
message = f'{_exception.__class__.__name__}: {message}'
|
||||
except Exception: # pylint: disable=broad-except
|
||||
message = f'UNKNOWN ERROR: {message}'
|
||||
if _exception.__class__.__name__ not in ('GenericError', 'GenericWarning'):
|
||||
try:
|
||||
message = f'{_exception.__class__.__name__}: {message}'
|
||||
except Exception: # pylint: disable=broad-except
|
||||
message = f'UNKNOWN ERROR: {message}'
|
||||
|
||||
# Fix multi-line messages
|
||||
if '\n' in message:
|
||||
|
|
@ -525,8 +526,8 @@ class TryAndPrint():
|
|||
return obj
|
||||
|
||||
# Try all modules
|
||||
for _mod in sys.modules:
|
||||
obj = getattr(sys.modules[_mod], name, None)
|
||||
for _mod in sys.modules.values():
|
||||
obj = getattr(_mod, name, None)
|
||||
if obj:
|
||||
break
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue