From c0ed80875350e76bfbed1ec6a530ac2bd907d2c9 Mon Sep 17 00:00:00 2001 From: Luc Saffre Date: Wed, 6 Mar 2019 09:49:52 +0200 Subject: [PATCH] Fixed a bug in intersphinx failure reporting --- sphinx/ext/intersphinx.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py index 1258cd84e37..a57923cc1e1 100644 --- a/sphinx/ext/intersphinx.py +++ b/sphinx/ext/intersphinx.py @@ -173,7 +173,7 @@ def fetch_inventory(app, uri, inv): f = open(path.join(app.srcdir, inv), 'rb') except Exception as err: err.args = ('intersphinx inventory %r not fetchable due to %s: %s', - inv, err.__class__, err) + inv, err.__class__, str(err)) raise try: if hasattr(f, 'url'): @@ -191,7 +191,7 @@ def fetch_inventory(app, uri, inv): raise ValueError('unknown or unsupported inventory version: %r' % exc) except Exception as err: err.args = ('intersphinx inventory %r not readable due to %s: %s', - inv, err.__class__.__name__, err) + inv, err.__class__.__name__, str(err)) raise else: return invdata @@ -234,10 +234,9 @@ def load_mappings(app): for fail in failures: logger.info(*fail) else: + issues = '\n'.join([f[0] % f[1:] for f in failures]) logger.warning(__("failed to reach any of the inventories " - "with the following issues:")) - for fail in failures: - logger.warning(*fail) + "with the following issues:") + "\n" + issues) if update: inventories.clear()