Unverified Commit 7dc6a3a9 authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub
Browse files

Merge pull request #176 from jmirabel/devel

Fix Python 3 doc generation
parents 749492c2 defe7268
Pipeline #9769 failed with stage
in 2 minutes and 37 seconds
...@@ -69,10 +69,13 @@ class XmlDocString (object): ...@@ -69,10 +69,13 @@ class XmlDocString (object):
if detailled is not None and len(detailled.getchildren()) > 0: if detailled is not None and len(detailled.getchildren()) > 0:
if brief is not None: self._newline () if brief is not None: self._newline ()
self.visit (detailled) self.visit (detailled)
from sys import stdout, stderr from sys import stdout, stderr, version_info
self.writeErrors(output) self.writeErrors(output)
self._clean() 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): def visit (self, node):
assert isinstance(node.tag, str) assert isinstance(node.tag, str)
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="2"> <package format="2">
<name>hpp-fcl</name> <name>hpp-fcl</name>
<version>1.4.3</version> <version>1.4.5</version>
<description>An extension of the Flexible Collision Library.</description> <description>An extension of the Flexible Collision Library.</description>
<!-- The maintainer listed here is for the ROS release to receive emails for the buildfarm. <!-- 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. --> Please check the repository URL for full list of authors and maintainers. -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment