Skip to content

Commit bb39be8

Browse files
committed
Avoid string formatting in log call
Remove handler and warning.warn
1 parent ba94bac commit bb39be8

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

odo/core.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from .utils import expand_tuples, ignoring
1010

1111
log = logging.getLogger(__name__)
12-
log.addHandler(logging.NullHandler())
1312

1413
ooc_types = set() # Out-of-Core types
1514

@@ -58,17 +57,20 @@ def _transform(graph, target, source, excluded_edges=None, ooc_types=ooc_types,
5857
pth = path(graph, type(source), target,
5958
excluded_edges=excluded_edges,
6059
ooc_types=ooc_types)
60+
6161
try:
6262
for (A, B, f) in pth:
63-
log.debug('[{src} -> {dest}] {f} ({kwargs})'.format(f=f.__name__,
64-
kwargs=kwargs, src=A.__name__, dest=B.__name__))
63+
log.debug("Transforming %s -> %s", A.__name__, B.__name__,
64+
extra={'kwargs': kwargs, 'f': f, 'excluded_edges': excluded_edges}
65+
)
6566
x = f(x, excluded_edges=excluded_edges, **kwargs)
6667
return x
6768
except NotImplementedError as e:
6869
if kwargs.get('raise_on_errors'):
6970
raise
70-
warn(FailedConversionWarning(A, B, e))
71-
log.warning('Failed Conversion {} -> {} ({})'.format(A, B, str(e)))
71+
log.warning('Failed on %s -> %s. Working around\nError message:\n%s',
72+
A.__name__, B.__name__, e
73+
)
7274
new_exclusions = excluded_edges | set([(A, B)])
7375
return _transform(graph, target, source, excluded_edges=new_exclusions,
7476
**kwargs)

0 commit comments

Comments
 (0)