|
9 | 9 | from .utils import expand_tuples, ignoring |
10 | 10 |
|
11 | 11 | log = logging.getLogger(__name__) |
12 | | -log.addHandler(logging.NullHandler()) |
13 | 12 |
|
14 | 13 | ooc_types = set() # Out-of-Core types |
15 | 14 |
|
@@ -58,17 +57,20 @@ def _transform(graph, target, source, excluded_edges=None, ooc_types=ooc_types, |
58 | 57 | pth = path(graph, type(source), target, |
59 | 58 | excluded_edges=excluded_edges, |
60 | 59 | ooc_types=ooc_types) |
| 60 | + |
61 | 61 | try: |
62 | 62 | 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 | + ) |
65 | 66 | x = f(x, excluded_edges=excluded_edges, **kwargs) |
66 | 67 | return x |
67 | 68 | except NotImplementedError as e: |
68 | 69 | if kwargs.get('raise_on_errors'): |
69 | 70 | 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 | + ) |
72 | 74 | new_exclusions = excluded_edges | set([(A, B)]) |
73 | 75 | return _transform(graph, target, source, excluded_edges=new_exclusions, |
74 | 76 | **kwargs) |
|
0 commit comments