--- Pootle-0.10.1/Pootle/indexpage.py.et 2007-01-12 16:11:31.000000000 +0100 +++ Pootle-0.10.1/Pootle/indexpage.py 2007-01-12 16:12:44.000000000 +0100 @@ -28,7 +28,8 @@ from translate import __version__ as toolkitversion from jToolkit import __version__ as jtoolkitversion from kid import __version__ as kidversion -from elementtree import ElementTree +import xml +from xml.etree.ElementTree import ElementTree import os import sys import sre @@ -68,7 +69,7 @@ versiontitle = self.localize("Versions") # l10n: If your language uses right-to-left layout and you leave the English untranslated, consider enclosing the necessary text with <span dir="ltr">.......</span> to help browsers to display it correctly. # l10n: Take care to use HTML tags correctly. A markup error could cause a display error. - versiontext = self.localize("This site is running:<br />Pootle %s<br />Translate Toolkit %s<br />jToolkit %s<br />Kid %s<br />ElementTree %s<br />Python %s (on %s/%s)", pootleversion.ver, toolkitversion.ver, jtoolkitversion.ver, kidversion, ElementTree.VERSION, sys.version, sys.platform, os.name) + versiontext = self.localize("This site is running:<br />Pootle %s<br />Translate Toolkit %s<br />jToolkit %s<br />Kid %s<br />ElementTree %s<br />Python %s (on %s/%s)", pootleversion.ver, toolkitversion.ver, jtoolkitversion.ver, kidversion, xml.etree.ElementTree.VERSION, sys.version, sys.platform, os.name) templatename = "about" instancetitle = getattr(session.instance, "title", session.localize("Pootle Demo")) sessionvars = {"status": session.status, "isopen": session.isopen, "issiteadmin": session.issiteadmin()} --- Pootle-0.10.1/Pootle/pootle.py.et 2007-01-12 16:11:31.000000000 +0100 +++ Pootle-0.10.1/Pootle/pootle.py 2007-01-12 16:12:44.000000000 +0100 @@ -40,7 +40,8 @@ from Pootle import __version__ as pootleversion from translate import __version__ as toolkitversion from jToolkit import __version__ as jtoolkitversion -from elementtree import ElementTree +import xml +from xml.etree.ElementTree import ElementTree # We don't need kid in this file, but this will show quickly if it is not # installed. jToolkit won't complain, so we have to stop here if we don't have kid import kid @@ -496,7 +497,7 @@ class PootleOptionParser(simplewebserver.WebOptionParser): def __init__(self): - versionstring = "%%prog %s\njToolkit %s\nTranslate Toolkit %s\nKid %s\nElementTree %s\nPython %s (on %s/%s)" % (pootleversion.ver, jtoolkitversion.ver, toolkitversion.ver, kid.__version__, ElementTree.VERSION, sys.version, sys.platform, os.name) + versionstring = "%%prog %s\njToolkit %s\nTranslate Toolkit %s\nKid %s\nElementTree %s\nPython %s (on %s/%s)" % (pootleversion.ver, jtoolkitversion.ver, toolkitversion.ver, kid.__version__, xml.etree.ElementTree.VERSION, sys.version, sys.platform, os.name) simplewebserver.WebOptionParser.__init__(self, version=versionstring) self.set_default('prefsfile', filelocations.prefsfile) self.set_default('instance', 'Pootle')