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

[Napoleon] Changes __unicode__ to use the six.u() function

Browse Source
This commit is contained in:
Rob Ruana
2015-11-18 10:37:00 -08:00
parent e926ebb263
commit 5a388ec0fc
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sphinx/ext/napoleon/docstring.py
View File

@@ -14,9 +14,8 @@
import collections
import inspect
import re
import sys
from six import string_types
from six import string_types, u
from six.moves import range
from sphinx.ext.napoleon.iterators import modify_iter
@@ -163,10 +162,7 @@ class GoogleDocstring(UnicodeMixin):
Unicode version of the docstring.
"""
if sys.version_info[0] >= 3:
return '\n'.join(self.lines())
else:
return u'\n'.join(self.lines())
return u('\n').join(self.lines())
def lines(self):
"""Return the parsed lines of the docstring in reStructuredText format.