More 2to3 fixes in the Tools directory. Fixes #2893.
diff --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py
index 781b4f8..771d7ac 100755
--- a/Tools/pybench/pybench.py
+++ b/Tools/pybench/pybench.py
@@ -107,15 +107,13 @@
buildno, builddate = platform.python_build()
python = platform.python_version()
try:
- unichr(100000)
+ chr(100000)
except ValueError:
# UCS2 build (standard)
- unicode = 'UCS2'
- except NameError:
- unicode = None
+ unitype = 'UCS2'
else:
# UCS4 build (most recent Linux distros)
- unicode = 'UCS4'
+ unitype = 'UCS4'
bits, linkage = platform.architecture()
return {
'platform': platform.platform(),
@@ -127,7 +125,7 @@
'compiler': platform.python_compiler(),
'buildno': buildno,
'builddate': builddate,
- 'unicode': unicode,
+ 'unicode': unitype,
'bits': bits,
}