diff -r b0996e4a289e -r 1d8dd9706f46 DocumentationTools/IndexGenerator.py --- a/DocumentationTools/IndexGenerator.py Fri Jan 01 16:11:36 2010 +0000 +++ b/DocumentationTools/IndexGenerator.py Sat Jan 02 15:11:35 2010 +0000 @@ -10,8 +10,8 @@ import sys import os -import TemplatesListsStyle -import TemplatesListsStyleCSS +from . import TemplatesListsStyle +from . import TemplatesListsStyleCSS from Utilities import joinext @@ -131,8 +131,7 @@ # 1) subpackages if package["subpackages"]: subpacks = package["subpackages"] - names = subpacks.keys() - names.sort() + names = sorted(list(subpacks.keys())) lst = [] for name in names: link = joinext("index-%s" % name, ".html") @@ -148,8 +147,7 @@ # 2) modules if package["modules"]: mods = package["modules"] - names = mods.keys() - names.sort() + names = sorted(list(mods.keys())) lst = [] for name in names: link = joinext(name, ".html") @@ -176,7 +174,7 @@ } + \ self.footerTemplate - f = open(filename, "wb") + f = open(filename, "w") f.write(doc) f.close() @@ -198,12 +196,12 @@ basename = basename.replace(os.sep, ".") if not basename.endswith("."): basename = "%s." % basename - for package, element in self.packages.items(): + for package, element in list(self.packages.items()): try: if basename: package = package.replace(basename,"") out = self.__writeIndex(package, element) - except IOError, v: + except IOError as v: sys.stderr.write("%s error: %s\n" % (package, v[1])) else: if out: