Skip to content

Commit

Permalink
Merge pull request #176 from jmirabel/devel
Browse files Browse the repository at this point in the history
Fix Python 3 doc generation
  • Loading branch information
nim65s authored Jun 3, 2020
2 parents 749492c + defe726 commit 7dc6a3a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions doc/python/xml_docstring.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,13 @@ def getDocString (self, brief, detailled, output):
if detailled is not None and len(detailled.getchildren()) > 0:
if brief is not None: self._newline ()
self.visit (detailled)
from sys import stdout, stderr
from sys import stdout, stderr, version_info
self.writeErrors(output)
self._clean()
return self._linesep.join(self.lines).encode("utf-8")
if version_info[0] == 2:
return self._linesep.join(self.lines).encode("utf-8")
else:
return self._linesep.join(self.lines)

def visit (self, node):
assert isinstance(node.tag, str)
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>hpp-fcl</name>
<version>1.4.3</version>
<version>1.4.5</version>
<description>An extension of the Flexible Collision Library.</description>
<!-- The maintainer listed here is for the ROS release to receive emails for the buildfarm.
Please check the repository URL for full list of authors and maintainers. -->
Expand Down

0 comments on commit 7dc6a3a

Please sign in to comment.