summaryrefslogtreecommitdiff
path: root/sphinx/domains/cpp.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/domains/cpp.py
parent317930a7fbd49b50fb8a144161a698fcafeab91a (diff)
parent5f13479408785818ee8b85d4172314ea5578fde3 (diff)
downloadsphinx-git-953b33d3f721e58ab48490d33c141df1e4dd25c1.tar.gz
Merge
Diffstat (limited to 'sphinx/domains/cpp.py')
-rw-r--r--sphinx/domains/cpp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index d44c9cd74..ef2460c1e 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -1065,7 +1065,7 @@ class CPPObject(ObjectDescription):
try:
rv = self.parse_definition(parser)
parser.assert_end()
- except DefinitionError, e:
+ except DefinitionError as e:
self.state_machine.reporter.warning(e.description, line=self.lineno)
raise ValueError
self.describe_signature(signode, rv)
@@ -1219,7 +1219,7 @@ class CPPCurrentNamespace(Directive):
try:
prefix = parser.parse_type()
parser.assert_end()
- except DefinitionError, e:
+ except DefinitionError as e:
self.state_machine.reporter.warning(e.description,
line=self.lineno)
else: