diff options
Diffstat (limited to 'Tools')
-rw-r--r-- | Tools/buildbot/build-amd64.bat | 6 | ||||
-rw-r--r-- | Tools/buildbot/clean-amd64.bat | 6 | ||||
-rw-r--r-- | Tools/buildbot/external-amd64.bat | 44 | ||||
-rw-r--r-- | Tools/buildbot/test-amd64.bat | 3 | ||||
-rwxr-xr-x | Tools/i18n/msgfmt.py | 2 | ||||
-rw-r--r-- | Tools/pybench/Arithmetic.py | 30 | ||||
-rw-r--r-- | Tools/pybench/CommandLine.py | 2 | ||||
-rw-r--r-- | Tools/pybench/Numbers.py | 358 | ||||
-rw-r--r-- | Tools/pybench/systimes.py | 6 | ||||
-rwxr-xr-x | Tools/scripts/classfix.py | 2 | ||||
-rwxr-xr-x | Tools/scripts/fixcid.py | 2 | ||||
-rwxr-xr-x | Tools/scripts/ftpmirror.py | 2 | ||||
-rwxr-xr-x | Tools/scripts/linktree.py | 4 | ||||
-rwxr-xr-x | Tools/scripts/methfix.py | 2 | ||||
-rwxr-xr-x | Tools/scripts/pathfix.py | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | Tools/scripts/reindent.py | 0 | ||||
-rwxr-xr-x | Tools/scripts/which.py | 2 | ||||
-rw-r--r-- | Tools/unicode/makeunicodedata.py | 2 | ||||
-rwxr-xr-x | Tools/webchecker/websucker.py | 2 |
19 files changed, 268 insertions, 209 deletions
diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat new file mode 100644 index 0000000..88edd8d --- /dev/null +++ b/Tools/buildbot/build-amd64.bat @@ -0,0 +1,6 @@ +@rem Used by the buildbot "compile" step. +setlocal +cmd /c Tools\buildbot\external-amd64.bat +call "%VS71COMNTOOLS%vsvars32.bat" +REM cmd /q/c Tools\buildbot\kill_python.bat +devenv.com /build ReleaseAMD64 PCbuild\pcbuild.sln diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat new file mode 100644 index 0000000..7ef5e02 --- /dev/null +++ b/Tools/buildbot/clean-amd64.bat @@ -0,0 +1,6 @@ +@rem Used by the buildbot "clean" step. +call "%VS71COMNTOOLS%vsvars32.bat" +cd PCbuild +@echo Deleting .pyc/.pyo files ... +python.exe rmpyc.py +devenv.com /clean ReleaseAMD64 pcbuild.sln diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat new file mode 100644 index 0000000..dac8cb3 --- /dev/null +++ b/Tools/buildbot/external-amd64.bat @@ -0,0 +1,44 @@ +@rem Fetches (and builds if necessary) external dependencies +setlocal + +@rem need this so that 'devenv' is found +call "%VS71COMNTOOLS%vsvars32.bat" +@rem set the build environment +call "%MSSdk%\SetEnv" /XP64 /RETAIL + +@rem Assume we start inside the Python source directory +cd .. + +@rem sqlite +if not exist sqlite-source-3.3.4 ( + svn export http://svn.python.org/projects/external/sqlite-source-3.3.4 + if exist build\PCbuild\sqlite3.dll del build\PCbuild\sqlite3.dll +) +if not exist build\PCbuild\sqlite3.dll ( + cd sqlite-source-3.3.4\amd64 + cl ..\*.c + link /def:..\sqlite3.def /dll *.obj /out:sqlite3.dll bufferoverflowU.lib + cd ..\.. + copy sqlite-source-3.3.4\amd64\sqlite3.dll build\PCbuild +) + +@rem bzip +if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3 + +@rem Sleepycat db +if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20 +if not exist "db-4.4.20\build_win32\Release_AMD64\libdb44s.lib" ( + cd db-4.4.20\build_win32 + devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv + cd ..\.. +) + +@rem OpenSSL +if not exist openssl-0.9.8a svn export http://svn.python.org/projects/external/openssl-0.9.8a + +@rem tcltk +if not exist tcl8.4.12 ( + if exist tcltk rd /s/q tcltk + svn export http://svn.python.org/projects/external/tcl8.4.12 + svn export http://svn.python.org/projects/external/tk8.4.12 +) diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat new file mode 100644 index 0000000..6995ece --- /dev/null +++ b/Tools/buildbot/test-amd64.bat @@ -0,0 +1,3 @@ +@rem Used by the buildbot "test" step. +cd PCbuild +call rt.bat -q -uall -rw diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py index 353be8b..c2f39a1 100755 --- a/Tools/i18n/msgfmt.py +++ b/Tools/i18n/msgfmt.py @@ -83,7 +83,7 @@ def generate(): voffsets += [l2, o2+valuestart] offsets = koffsets + voffsets output = struct.pack("Iiiiiii", - 0x950412deL, # Magic + 0x950412de, # Magic 0, # Version len(keys), # # of entries 7*4, # start of key index diff --git a/Tools/pybench/Arithmetic.py b/Tools/pybench/Arithmetic.py index 6ef2f20..d4766a7 100644 --- a/Tools/pybench/Arithmetic.py +++ b/Tools/pybench/Arithmetic.py @@ -476,9 +476,9 @@ class SimpleLongArithmetic(Test): for i in range(self.rounds): - a = 2220001L - b = 100001L - c = 30005L + a = 2220001 + b = 100001 + c = 30005 c = a + b c = b + c @@ -504,9 +504,9 @@ class SimpleLongArithmetic(Test): c = b / a c = c / b - a = 2220001L - b = 100001L - c = 30005L + a = 2220001 + b = 100001 + c = 30005 c = a + b c = b + c @@ -532,9 +532,9 @@ class SimpleLongArithmetic(Test): c = b / a c = c / b - a = 2220001L - b = 100001L - c = 30005L + a = 2220001 + b = 100001 + c = 30005 c = a + b c = b + c @@ -560,9 +560,9 @@ class SimpleLongArithmetic(Test): c = b / a c = c / b - a = 2220001L - b = 100001L - c = 30005L + a = 2220001 + b = 100001 + c = 30005 c = a + b c = b + c @@ -588,9 +588,9 @@ class SimpleLongArithmetic(Test): c = b / a c = c / b - a = 2220001L - b = 100001L - c = 30005L + a = 2220001 + b = 100001 + c = 30005 c = a + b c = b + c diff --git a/Tools/pybench/CommandLine.py b/Tools/pybench/CommandLine.py index 909ef02..1cdcfc1 100644 --- a/Tools/pybench/CommandLine.py +++ b/Tools/pybench/CommandLine.py @@ -82,7 +82,7 @@ def fileopen(name, mode='wb', encoding=None): else: f = open(name, mode) if 'w' in mode: - os.chmod(name, 0600) + os.chmod(name, 0o600) return f def option_dict(options): diff --git a/Tools/pybench/Numbers.py b/Tools/pybench/Numbers.py index b0a11f4..1b21673 100644 --- a/Tools/pybench/Numbers.py +++ b/Tools/pybench/Numbers.py @@ -598,185 +598,185 @@ class CompareLongs(Test): for i in range(self.rounds): - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L - - 1234567890L < 3456789012345L - 1234567890L > 3456789012345L - 1234567890L == 3456789012345L - 1234567890L > 3456789012345L - 1234567890L < 3456789012345L + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 + + 1234567890 < 3456789012345 + 1234567890 > 3456789012345 + 1234567890 == 3456789012345 + 1234567890 > 3456789012345 + 1234567890 < 3456789012345 def calibrate(self): diff --git a/Tools/pybench/systimes.py b/Tools/pybench/systimes.py index 5478c28..13bed2f 100644 --- a/Tools/pybench/systimes.py +++ b/Tools/pybench/systimes.py @@ -180,9 +180,9 @@ def processtime(): ### Testing def some_workload(): - x = 0L - for i in range(10000000L): - x = x + 1L + x = 0 + for i in range(10000000): + x = x + 1 def test_workload(): print 'Testing systimes() under load conditions' diff --git a/Tools/scripts/classfix.py b/Tools/scripts/classfix.py index f65e630..0cd1e49 100755 --- a/Tools/scripts/classfix.py +++ b/Tools/scripts/classfix.py @@ -129,7 +129,7 @@ def fix(filename): # First copy the file's mode to the temp file try: statbuf = os.stat(filename) - os.chmod(tempname, statbuf[ST_MODE] & 07777) + os.chmod(tempname, statbuf[ST_MODE] & 0o7777) except os.error as msg: err('%s: warning: chmod failed (%r)\n' % (tempname, msg)) # Then make a backup of the original file as filename~ diff --git a/Tools/scripts/fixcid.py b/Tools/scripts/fixcid.py index 29e0e10..d434345 100755 --- a/Tools/scripts/fixcid.py +++ b/Tools/scripts/fixcid.py @@ -174,7 +174,7 @@ def fix(filename): # First copy the file's mode to the temp file try: statbuf = os.stat(filename) - os.chmod(tempname, statbuf[ST_MODE] & 07777) + os.chmod(tempname, statbuf[ST_MODE] & 0o7777) except os.error as msg: err(tempname + ': warning: chmod failed (' + str(msg) + ')\n') # Then make a backup of the original file as filename~ diff --git a/Tools/scripts/ftpmirror.py b/Tools/scripts/ftpmirror.py index 39ef18e..7318b37 100755 --- a/Tools/scripts/ftpmirror.py +++ b/Tools/scripts/ftpmirror.py @@ -375,7 +375,7 @@ def makedir(pathname): return dirname = os.path.dirname(pathname) if dirname: makedir(dirname) - os.mkdir(pathname, 0777) + os.mkdir(pathname, 0o777) # Write a dictionary to a file in a way that can be read back using # rval() but is still somewhat readable (i.e. not a single long line). diff --git a/Tools/scripts/linktree.py b/Tools/scripts/linktree.py index 7f17046..2b41e7d 100755 --- a/Tools/scripts/linktree.py +++ b/Tools/scripts/linktree.py @@ -31,7 +31,7 @@ def main(): print oldtree + ': not a directory' return 1 try: - os.mkdir(newtree, 0777) + os.mkdir(newtree, 0o777) except os.error as msg: print newtree + ': cannot mkdir:', msg return 1 @@ -63,7 +63,7 @@ def linknames(old, new, link): if os.path.isdir(oldname) and \ not os.path.islink(oldname): try: - os.mkdir(newname, 0777) + os.mkdir(newname, 0o777) ok = 1 except: print newname + \ diff --git a/Tools/scripts/methfix.py b/Tools/scripts/methfix.py index 11875a1..f5fe7cd 100755 --- a/Tools/scripts/methfix.py +++ b/Tools/scripts/methfix.py @@ -140,7 +140,7 @@ def fix(filename): # First copy the file's mode to the temp file try: statbuf = os.stat(filename) - os.chmod(tempname, statbuf[ST_MODE] & 07777) + os.chmod(tempname, statbuf[ST_MODE] & 0o7777) except os.error as msg: err('%s: warning: chmod failed (%r)\n' % (tempname, msg)) # Then make a backup of the original file as filename~ diff --git a/Tools/scripts/pathfix.py b/Tools/scripts/pathfix.py index c59c0f2..601a172 100755 --- a/Tools/scripts/pathfix.py +++ b/Tools/scripts/pathfix.py @@ -121,7 +121,7 @@ def fix(filename): # First copy the file's mode to the temp file try: statbuf = os.stat(filename) - os.chmod(tempname, statbuf[ST_MODE] & 07777) + os.chmod(tempname, statbuf[ST_MODE] & 0o7777) except os.error as msg: err('%s: warning: chmod failed (%r)\n' % (tempname, msg)) # Then make a backup of the original file as filename~ diff --git a/Tools/scripts/reindent.py b/Tools/scripts/reindent.py index 33ee4b7..33ee4b7 100644..100755 --- a/Tools/scripts/reindent.py +++ b/Tools/scripts/reindent.py diff --git a/Tools/scripts/which.py b/Tools/scripts/which.py index 49b69ac..368eea2 100755 --- a/Tools/scripts/which.py +++ b/Tools/scripts/which.py @@ -35,7 +35,7 @@ def main(): msg(filename + ': not a disk file') else: mode = S_IMODE(st[ST_MODE]) - if mode & 0111: + if mode & 0o111: if not ident: print filename ident = st[:3] diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py index 2a85e84..673f713 100644 --- a/Tools/unicode/makeunicodedata.py +++ b/Tools/unicode/makeunicodedata.py @@ -757,7 +757,7 @@ def myhash(s, magic): h = 0 for c in map(ord, s.upper()): h = (h * magic) + c - ix = h & 0xff000000L + ix = h & 0xff000000 if ix: h = (h ^ ((ix>>24) & 0xff)) & 0x00ffffff return h diff --git a/Tools/webchecker/websucker.py b/Tools/webchecker/websucker.py index 239cb52..12be86e 100755 --- a/Tools/webchecker/websucker.py +++ b/Tools/webchecker/websucker.py @@ -119,7 +119,7 @@ def makedirs(dir): print "Huh? Don't know how to make dir", dir return makedirs(head) - os.mkdir(dir, 0777) + os.mkdir(dir, 0o777) if __name__ == '__main__': sys.exit(main() or 0) |