summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2014-05-28 00:14:50 +0900
committershimizukawa <shimizukawa@gmail.com>2014-05-28 00:14:50 +0900
commite01bb112adb43526ccb7800ebec4229bc0196252 (patch)
tree9d4cb369702423342fb7195683bcdcffc31ee9b5
parent2bea449254abb21a56f4d7193ece32afb2da82f8 (diff)
downloadsphinx-e01bb112adb43526ccb7800ebec4229bc0196252.tar.gz
* update CHANGES and fix for py3-compat for pull request #241. Closes #1466
-rw-r--r--CHANGES2
-rw-r--r--tests/test_cpp_domain.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 38d53e48..bd023e66 100644
--- a/CHANGES
+++ b/CHANGES
@@ -143,6 +143,8 @@ Bugs fixed
* #636: Keep straight single quotes in literal blocks in the LaTeX build.
* PR#235: comment db schema of websupport lacked a length of the node_id field.
Thanks to solos.
+* #1466,PR#241: Fix failure of the cpp domain parser to parse C+11
+ "variadic templates" declarations. Thanks to Victor Zverovich.
Documentation
-------------
diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py
index 5a0b8b6f..57dc74a5 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_cpp_domain.py
@@ -127,7 +127,7 @@ def test_type_definitions():
raises(DefinitionError, parse, 'function', x)
x = 'int foo(const A&... a)'
- assert unicode(parse('function', x)) == x
+ assert text_type(parse('function', x)) == x
def test_bases():
x = 'A'