IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1780: Remove duplicated "class" and "exception" keywords from text builder

Browse Source
This commit is contained in:
Takayuki Hirai 2015-04-28 22:17:09 +09:00
parent 2ee54dfd0b
commit 78000d2066
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/writers/text.py
View File

@ -303,8 +303,6 @@ class TextTranslator(nodes.NodeVisitor):
def visit_desc_signature(self, node): def visit_desc_signature(self, node):
self.new_state(0) self.new_state(0)
if node.parent['objtype'] in ('class', 'exception'):
self.add_text('%s ' % node.parent['objtype'])
def depart_desc_signature(self, node): def depart_desc_signature(self, node):
# XXX: wrap signatures in a way that makes sense # XXX: wrap signatures in a way that makes sense

10
tests/test_intl.py
View File

@ -269,21 +269,21 @@ def test_text_builder(app, status, warning):
result = (app.outdir / 'docfields.txt').text(encoding='utf-8') result = (app.outdir / 'docfields.txt').text(encoding='utf-8')
expect = (u"\nI18N WITH DOCFIELDS" expect = (u"\nI18N WITH DOCFIELDS"
u"\n*******************\n" u"\n*******************\n"
u"\nclass class Cls1\n" u"\nclass Cls1\n"
u"\n Parameters:" u"\n Parameters:"
u"\n **param** -- DESCRIPTION OF PARAMETER param\n" u"\n **param** -- DESCRIPTION OF PARAMETER param\n"
u"\nclass class Cls2\n" u"\nclass Cls2\n"
u"\n Parameters:" u"\n Parameters:"
u"\n * **foo** -- DESCRIPTION OF PARAMETER foo\n" u"\n * **foo** -- DESCRIPTION OF PARAMETER foo\n"
u"\n * **bar** -- DESCRIPTION OF PARAMETER bar\n" u"\n * **bar** -- DESCRIPTION OF PARAMETER bar\n"
u"\nclass class Cls3(values)\n" u"\nclass Cls3(values)\n"
u"\n Raises ValueError:" u"\n Raises ValueError:"
u"\n IF THE VALUES ARE OUT OF RANGE\n" u"\n IF THE VALUES ARE OUT OF RANGE\n"
u"\nclass class Cls4(values)\n" u"\nclass Cls4(values)\n"
u"\n Raises:" u"\n Raises:"
u"\n * **TypeError** -- IF THE VALUES ARE NOT VALID\n" u"\n * **TypeError** -- IF THE VALUES ARE NOT VALID\n"
u"\n * **ValueError** -- IF THE VALUES ARE OUT OF RANGE\n" u"\n * **ValueError** -- IF THE VALUES ARE OUT OF RANGE\n"
u"\nclass class Cls5\n" u"\nclass Cls5\n"
u"\n Returns:" u"\n Returns:"
u'\n A NEW "Cls3" INSTANCE\n') u'\n A NEW "Cls3" INSTANCE\n')
yield assert_equal, result, expect yield assert_equal, result, expect