diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 03:59:46 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 03:59:46 (GMT) |
| commit | 4969f709cc07088a40574c05724d83cddc8fafc7 (patch) | |
| tree | ddb254d02f2bd0c4d9d7c141f5f95521669042a0 /Tools | |
| parent | c48c19afe031d0a35a3d5aacddad4e113e1aeaf0 (diff) | |
| parent | 42da663e6fe7ecbb89b17d596c76812a91bb99a4 (diff) | |
| download | cpython-4969f709cc07088a40574c05724d83cddc8fafc7.zip cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.gz cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.bz2 | |
#11515: Merge with 3.1.
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/demo/ss1.py | 2 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 2 | ||||
| -rwxr-xr-x | Tools/pybench/pybench.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Tools/demo/ss1.py b/Tools/demo/ss1.py index 2d1e490..4cea667 100755 --- a/Tools/demo/ss1.py +++ b/Tools/demo/ss1.py @@ -586,7 +586,7 @@ class SheetGUI: cell = Tk.Label(self.cellgrid, relief='raised') cell.grid_configure(column=0, row=0, sticky='NSWE') cell.bind("<ButtonPress-1>", self.selectall) - # Create the top row of labels, and confiure the grid columns + # Create the top row of labels, and configure the grid columns for x in range(1, columns+1): self.cellgrid.grid_columnconfigure(x, minsize=64) cell = Tk.Label(self.cellgrid, text=colnum2name(x), relief='raised') diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 31c9b82..53e652d 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -178,7 +178,7 @@ mingw_lib = os.path.join(srcdir, PCBUILD, "libpython%s%s.a" % (major, minor)) have_mingw = build_mingw_lib(lib_file, def_file, dll_file, mingw_lib) -# Determine the target architechture +# Determine the target architecture dll_path = os.path.join(srcdir, PCBUILD, dll_file) msilib.set_arch_from_file(dll_path) if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"): diff --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py index 2999271..811ef96 100755 --- a/Tools/pybench/pybench.py +++ b/Tools/pybench/pybench.py @@ -682,7 +682,7 @@ class Benchmark: other_total_avg_time = other_total_avg_time + other_avg_time if (benchmarks_compatible and test.compatible(other)): - # Both benchmark and tests are comparible + # Both benchmark and tests are comparable min_diff = ((min_time * self.warp) / (other_min_time * other.warp) - 1.0) avg_diff = ((avg_time * self.warp) / @@ -696,7 +696,7 @@ class Benchmark: else: avg_diff = '%+5.1f%%' % (avg_diff * PERCENT) else: - # Benchmark or tests are not comparible + # Benchmark or tests are not comparable min_diff, avg_diff = 'n/a', 'n/a' tests_compatible = 0 print('%30s: %5.0fms %5.0fms %7s %5.0fms %5.0fms %7s' % \ |