5 files changed, 19 insertions, 9 deletions
diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index 15d7365..ec71804 100644
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -1,7 +1,7 @@
 @rem Used by the buildbot "clean" step.
 call "%VS90COMNTOOLS%vsvars32.bat"
-cd PCbuild
 @echo Deleting .pyc/.pyo files ...
 del /s Lib\*.pyc Lib\*.pyo
+cd PCbuild
 vcbuild /clean pcbuild.sln "Release|Win32"
 vcbuild /clean pcbuild.sln "Debug|Win32"
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
index 3e5c859..0ea4d64 100644
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -10,10 +10,15 @@ call "%VS90COMNTOOLS%vsvars32.bat"
 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
-@REM if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (
-@REM    vcbuild db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static
-@REM )
+@rem Remove VS 2003 builds
+if exist db-4.4.20 if not exist db-4.4.20\build_win32\this_is_for_vs9 (
+   echo Removing old build
+   rd /s/q db-4.4.20
+)
+if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20
+if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (
+   vcbuild db-4.4.20\build_win32\db_static.vcproj "Debug AMD64|x64"
+)
 
 @rem OpenSSL
 if not exist openssl-0.9.8g (
diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat
index 9cb6968..d178c92 100644
--- a/Tools/buildbot/test-amd64.bat
+++ b/Tools/buildbot/test-amd64.bat
@@ -1,3 +1,3 @@
 @rem Used by the buildbot "test" step.
-cd PC\VS7.1
-call rt.bat -q -uall -rw
+cd PCbuild
+call rt.bat -q -d -x64 -uall -rw
diff --git a/Tools/pybench/Setup.py b/Tools/pybench/Setup.py
index f1417e6..21e654a 100644
--- a/Tools/pybench/Setup.py
+++ b/Tools/pybench/Setup.py
@@ -30,6 +30,10 @@ from Lists import *
 from Tuples import *
 from Dict import *
 from Exceptions import *
+try:
+    from With import *
+except SyntaxError:
+    pass
 from Imports import *
 from Strings import *
 from Numbers import *
diff --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py
index dd398f5..624347f 100755
--- a/Tools/pybench/pybench.py
+++ b/Tools/pybench/pybench.py
@@ -121,7 +121,8 @@ def get_machine_details():
         'platform': platform.platform(),
         'processor': platform.processor(),
         'executable': sys.executable,
-        'implementation': platform.python_implementation(),
+        'implementation': getattr(platform, 'python_implementation',
+                                  lambda:'n/a')(),
         'python': platform.python_version(),
         'compiler': platform.python_compiler(),
         'buildno': buildno,
@@ -833,7 +834,7 @@ python pybench.py -s p25.pybench -c p21.pybench
         print('PYBENCH %s' % __version__)
         print('-' * LINE)
         print('* using %s %s' % (
-            platform.python_implementation(),
+            getattr(platform, 'python_implementation', lambda:'Python')(),
             ' '.join(sys.version.split())))
 
         # Switch off garbage collection