summaryrefslogtreecommitdiff
path: root/sphinx/ext/intersphinx.py
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2014-01-22 18:34:51 +0400
committerDmitry Shachnev <mitya57@gmail.com>2014-01-22 18:34:51 +0400
commit953b33d3f721e58ab48490d33c141df1e4dd25c1 (patch)
tree26bce4c2ef75b4ebe8422685d8962aa07978bad2 /sphinx/ext/intersphinx.py
parent317930a7fbd49b50fb8a144161a698fcafeab91a (diff)
parent5f13479408785818ee8b85d4172314ea5578fde3 (diff)
downloadsphinx-git-953b33d3f721e58ab48490d33c141df1e4dd25c1.tar.gz
Merge
Diffstat (limited to 'sphinx/ext/intersphinx.py')
-rw-r--r--sphinx/ext/intersphinx.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index 193562b26..a83258de8 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -132,7 +132,7 @@ def fetch_inventory(app, uri, inv):
f = urllib2.urlopen(inv)
else:
f = open(path.join(app.srcdir, inv), 'rb')
- except Exception, err:
+ except Exception as err:
app.warn('intersphinx inventory %r not fetchable due to '
'%s: %s' % (inv, err.__class__, err))
return
@@ -149,7 +149,7 @@ def fetch_inventory(app, uri, inv):
except ValueError:
f.close()
raise ValueError('unknown or unsupported inventory version')
- except Exception, err:
+ except Exception as err:
app.warn('intersphinx inventory %r not readable due to '
'%s: %s' % (inv, err.__class__.__name__, err))
else: