[Python-3000-checkins] r59346 - in python/branches/py3k: PCbuild9/build_tkinter.py Tools/pybench/pybench.py

[christian.heimes]

Author: christian.heimes
Date: Wed Dec  5 10:36:42 2007
New Revision: 59346

Modified:
   python/branches/py3k/PCbuild9/build_tkinter.py
   python/branches/py3k/Tools/pybench/pybench.py
Log:
Reverted two commit accidents

Modified: python/branches/py3k/PCbuild9/build_tkinter.py
==============================================================================
--- python/branches/py3k/PCbuild9/build_tkinter.py	(original)
+++ python/branches/py3k/PCbuild9/build_tkinter.py	Wed Dec  5 10:36:42 2007
@@ -12,12 +12,12 @@
 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 "
 

Modified: python/branches/py3k/Tools/pybench/pybench.py
==============================================================================
--- python/branches/py3k/Tools/pybench/pybench.py	(original)
+++ python/branches/py3k/Tools/pybench/pybench.py	Wed Dec  5 10:36:42 2007
@@ -301,7 +301,6 @@
         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: