diff -r 0e5421d679e7 -r ea526b78ee6c DocumentationTools/QtHelpGenerator.py --- a/DocumentationTools/QtHelpGenerator.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DocumentationTools/QtHelpGenerator.py Tue Mar 07 18:53:18 2017 +0100 @@ -113,8 +113,8 @@ file = file.replace(basename, "") if "__init__" in file: - dir = os.path.dirname(file) - udir = os.path.dirname(dir) + dirName = os.path.dirname(file) + udir = os.path.dirname(dirName) if udir: upackage = udir.replace(os.sep, ".") try: @@ -123,7 +123,7 @@ elt = self.packages["00index"] else: elt = self.packages["00index"] - package = dir.replace(os.sep, ".") + package = dirName.replace(os.sep, ".") elt["subpackages"][package] = moduleDocument.name() self.packages[package] = { @@ -220,8 +220,8 @@ basename = "{0}.".format(basename) sections = self.__generateSections("00index", 3) - filesList = sorted( - [e for e in os.listdir(self.htmlDir) if e.endswith('.html')]) + filesList = sorted(e for e in os.listdir(self.htmlDir) + if e.endswith('.html')) files = "\n".join( [" <file>{0}</file>".format(f) for f in filesList]) filterAttribs = "\n".join(