summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--sphinx/domains/python.py4
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 53974c52..a7dd5720 100644
--- a/CHANGES
+++ b/CHANGES
@@ -66,6 +66,9 @@ Bugs fixed
* #1155: Fix autodocumenting C-defined methods as attributes in Python 3.
+* #1233: Allow finding both Python classes and exceptions with the "class" and
+ "exc" roles in intersphinx.
+
Documentation
-------------
diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index 0c08b60b..a7ed7557 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -559,8 +559,8 @@ class PythonDomain(Domain):
object_types = {
'function': ObjType(l_('function'), 'func', 'obj'),
'data': ObjType(l_('data'), 'data', 'obj'),
- 'class': ObjType(l_('class'), 'class', 'obj'),
- 'exception': ObjType(l_('exception'), 'exc', 'obj'),
+ 'class': ObjType(l_('class'), 'class', 'exc', 'obj'),
+ 'exception': ObjType(l_('exception'), 'exc', 'class', 'obj'),
'method': ObjType(l_('method'), 'meth', 'obj'),
'classmethod': ObjType(l_('class method'), 'meth', 'obj'),
'staticmethod': ObjType(l_('static method'), 'meth', 'obj'),