diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-06-25 19:28:29 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-06-25 19:28:29 +0200 |
| commit | 03ae7938351f01313d30a41927ffb77670fcca14 (patch) | |
| tree | 586744f0e2b7560dc161f2a7a60030155d43ce8a /docs/doxygen/doxyxml/generated/compound.py | |
| parent | d78f7fcd0dadd362fcdc99194da5343a506eb519 (diff) | |
| parent | c66aec4dfae559004e88da968d1ce57584e144ee (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/generated/compound.py')
| -rw-r--r-- | docs/doxygen/doxyxml/generated/compound.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/doxygen/doxyxml/generated/compound.py b/docs/doxygen/doxyxml/generated/compound.py index 1522ac23f1..cd3cd1f96b 100644 --- a/docs/doxygen/doxyxml/generated/compound.py +++ b/docs/doxygen/doxyxml/generated/compound.py @@ -3,15 +3,16 @@ """ Generated Mon Feb 9 19:08:05 2009 by generateDS.py. """ +from __future__ import unicode_literals + -from string import lower as str_lower from xml.dom import minidom from xml.dom import Node import sys -import compoundsuper as supermod -from compoundsuper import MixedContainer +from . import compoundsuper as supermod +from .compoundsuper import MixedContainer class DoxygenTypeSub(supermod.DoxygenType): @@ -499,5 +500,3 @@ def parse(inFilename): rootObj = supermod.DoxygenType.factory() rootObj.build(rootNode) return rootObj - - |