From: Christian Heimes <christian@cheimes.de>
Date: Wed, 5 Dec 2007 09:36:42 +0000 (+0000)
Subject: Reverted two commit accidents
X-Git-Tag: v3.0a2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60d388d98d63c8d6a8eac51a8f0e45016bbd1cf6;p=thirdparty%2FPython%2Fcpython.git

Reverted two commit accidents
---

diff --git a/PCbuild9/build_tkinter.py b/PCbuild9/build_tkinter.py
index 993c37c82c24..5423a3b1130b 100644
--- a/PCbuild9/build_tkinter.py
+++ b/PCbuild9/build_tkinter.py
@@ -12,12 +12,12 @@ import shutil
 here = os.path.abspath(os.path.dirname(__file__))
 par = os.path.pardir
 
-TCL = "tcl8.4.16"
-TIX = "Tix8.4.2"
-TK = "tk8.4.16"
-#TCL = "tcl8.4.12"
-#TIX = "Tix8.4.0"
-#TK = "tk8.4.12"
+#TCL = "tcl8.4.16"
+#TIX = "Tix8.4.2"
+#TK = "tk8.4.16"
+TCL = "tcl8.4.12"
+TIX = "Tix8.4.0"
+TK = "tk8.4.12"
 ROOT = os.path.abspath(os.path.join(here, par, par))
 NMAKE = "nmake /nologo "
 
diff --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py
index 1a6c85b61586..dd398f5cbadf 100755
--- a/Tools/pybench/pybench.py
+++ b/Tools/pybench/pybench.py
@@ -301,7 +301,6 @@ class Test:
         if _debug:
             print('Calib. overhead time = %.6fms' % (
                 min_overhead * MILLI_SECONDS))
-        return
         if min_overhead < 0.0:
             raise ValueError('calibration setup did not work')
         if max_overhead - min_overhead > 0.1: