#7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote.
diff --git a/Lib/cgitb.py b/Lib/cgitb.py
index 35f4a50..5becdf3 100644
--- a/Lib/cgitb.py
+++ b/Lib/cgitb.py
@@ -99,8 +99,9 @@
lasttoken = token
return vars
-def html((etype, evalue, etb), context=5):
+def html(einfo, context=5):
"""Return a nice HTML document describing a given traceback."""
+ etype, evalue, etb = einfo
if type(etype) is types.ClassType:
etype = etype.__name__
pyver = 'Python ' + sys.version.split()[0] + ': ' + sys.executable
@@ -189,8 +190,9 @@
''' % pydoc.html.escape(
''.join(traceback.format_exception(etype, evalue, etb)))
-def text((etype, evalue, etb), context=5):
+def text(einfo, context=5):
"""Return a plain text document describing a given traceback."""
+ etype, evalue, etb = einfo
if type(etype) is types.ClassType:
etype = etype.__name__
pyver = 'Python ' + sys.version.split()[0] + ': ' + sys.executable