summaryrefslogtreecommitdiff
path: root/docs/doxygen/doxyxml/__init__.py
diff options
context:
space:
mode:
authorMarcus Müller <marcus@hostalia.de>2018-06-25 19:28:29 +0200
committerMarcus Müller <marcus@hostalia.de>2018-06-25 19:28:29 +0200
commit03ae7938351f01313d30a41927ffb77670fcca14 (patch)
tree586744f0e2b7560dc161f2a7a60030155d43ce8a /docs/doxygen/doxyxml/__init__.py
parentd78f7fcd0dadd362fcdc99194da5343a506eb519 (diff)
parentc66aec4dfae559004e88da968d1ce57584e144ee (diff)
Merge branch 'next_python3' into next
This brings Python3 to `next`. It also brings * a bump in SWIG dependency version * various GRC improvements, * YAML instead of XML in GRC * a lot of broken unit tests
Diffstat (limited to 'docs/doxygen/doxyxml/__init__.py')
-rw-r--r--docs/doxygen/doxyxml/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/doxygen/doxyxml/__init__.py b/docs/doxygen/doxyxml/__init__.py
index 5cd0b3c6c5..b7a8884519 100644
--- a/docs/doxygen/doxyxml/__init__.py
+++ b/docs/doxygen/doxyxml/__init__.py
@@ -63,8 +63,9 @@ This line is uninformative and is only to test line breaks in the comments.
u'Outputs the vital aadvark statistics.'
"""
+from __future__ import unicode_literals
-from doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther
+from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther
def _test():
import os