Imported Upstream version 2.3.2upstream/2.3.2

9 files changed, 47 insertions, 20 deletions

diff --git a/QMTest/README.txt b/QMTest/README.txt
index 18167cc..e279d71 100644
--- a/QMTest/README.txt
+++ b/QMTest/README.txt
@@ -54,5 +54,5 @@ the pieces here are local to SCons.
         from this infrastructure, in no small part because we're not
         really using it as originally envisioned.
 
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
-QMTest/README.txt  2014/03/02 14:18:15 garyo
+Copyright (c) 2001 - 2014 The SCons Foundation
+QMTest/README.txt  2014/07/05 09:42:21 garyo
diff --git a/QMTest/SConscript b/QMTest/SConscript
index 75f2770..eb1ece5 100644
--- a/QMTest/SConscript
+++ b/QMTest/SConscript
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
+# Copyright (c) 2001 - 2014 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py
index 38e9cd3..b51d90f 100644
--- a/QMTest/TestCmd.py
+++ b/QMTest/TestCmd.py
@@ -672,8 +672,35 @@ except AttributeError:
 PIPE = subprocess.PIPE
 
 if subprocess.mswindows:
-    from win32file import ReadFile, WriteFile
-    from win32pipe import PeekNamedPipe
+    try:
+        from win32file import ReadFile, WriteFile
+        from win32pipe import PeekNamedPipe
+    except ImportError:
+        # If PyWin32 is not available, try ctypes instead
+        # XXX These replicate _just_enough_ PyWin32 behaviour for our purposes
+        import ctypes; from ctypes.wintypes import DWORD
+        def ReadFile(hFile, bufSize, ol=None):
+            assert ol is None
+            lpBuffer = ctypes.create_string_buffer(bufSize)
+            bytesRead = DWORD()
+            bErr = ctypes.windll.kernel32.ReadFile( 
+                    hFile, lpBuffer, bufSize, ctypes.byref(bytesRead), ol)
+            if not bErr: raise ctypes.WinError()
+            return (0, ctypes.string_at(lpBuffer, bytesRead.value))
+        def WriteFile(hFile, data, ol=None):
+            assert ol is None
+            bytesWritten = DWORD()
+            bErr = ctypes.windll.kernel32.WriteFile(
+                    hFile, data, len(data), ctypes.byref(bytesWritten), ol)
+            if not bErr: raise ctypes.WinError()
+            return (0, bytesWritten.value)
+        def PeekNamedPipe(hPipe, size):
+            assert size == 0
+            bytesAvail = DWORD()
+            bErr = ctypes.windll.kernel32.PeekNamedPipe(
+                    hPipe, None, size, None, ctypes.byref(bytesAvail), None)
+            if not bErr: raise ctypes.WinError()
+            return ("", bytesAvail.value, None)
     import msvcrt
 else:
     import select
diff --git a/QMTest/TestRuntest.py b/QMTest/TestRuntest.py
index 31346cd..c4f9301 100644
--- a/QMTest/TestRuntest.py
+++ b/QMTest/TestRuntest.py
@@ -12,9 +12,9 @@ from those classes, as well as any overridden or additional methods or
 attributes defined in this subclass.
 """
 
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
+# Copyright (c) 2001 - 2014 The SCons Foundation
 
-__revision__ = "QMTest/TestRuntest.py  2014/03/02 14:18:15 garyo"
+__revision__ = "QMTest/TestRuntest.py  2014/07/05 09:42:21 garyo"
 
 import os
 import os.path
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index ea1cb77..24f285a 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -12,10 +12,10 @@ from those classes, as well as any overridden or additional methods or
 attributes defined in this subclass.
 """
 
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
+# Copyright (c) 2001 - 2014 The SCons Foundation
 from __future__ import division
 
-__revision__ = "QMTest/TestSCons.py  2014/03/02 14:18:15 garyo"
+__revision__ = "QMTest/TestSCons.py  2014/07/05 09:42:21 garyo"
 
 import os
 import re
@@ -34,7 +34,7 @@ from TestCmd import PIPE
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '2.3.1'
+default_version = '2.3.2'
 
 python_version_unsupported = (2, 3, 0)
 python_version_deprecated = (2, 7, 0)
@@ -43,7 +43,7 @@ python_version_deprecated = (2, 7, 0)
 # line must remain "__ VERSION __" (without the spaces) so the built
 # version in build/QMTest/TestSCons.py contains the actual version
 # string of the packages that have been built.
-SConsVersion = '2.3.1'
+SConsVersion = '2.3.2'
 if SConsVersion == '__' + 'VERSION' + '__':
     SConsVersion = default_version
 
@@ -150,7 +150,7 @@ def deprecated_python_version(version=sys.version_info):
 if deprecated_python_version():
     msg = r"""
 scons: warning: Support for pre-2.7.0 Python version (%s) is deprecated.
-    If this will cause hardship, contact dev@scons.tigris.org.
+    If this will cause hardship, contact scons-dev@scons.org
 """
 
     deprecated_python_expr = re_escape(msg % python_version_string()) + file_expr
diff --git a/QMTest/TestSConsMSVS.py b/QMTest/TestSConsMSVS.py
index 42564a7..cad1849 100644
--- a/QMTest/TestSConsMSVS.py
+++ b/QMTest/TestSConsMSVS.py
@@ -13,9 +13,9 @@ as well as any overridden or additional methods or attributes defined
 in this subclass.
 """
 
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
+# Copyright (c) 2001 - 2014 The SCons Foundation
 
-__revision__ = "QMTest/TestSConsMSVS.py  2014/03/02 14:18:15 garyo"
+__revision__ = "QMTest/TestSConsMSVS.py  2014/07/05 09:42:21 garyo"
 
 import os
 import sys
diff --git a/QMTest/TestSCons_time.py b/QMTest/TestSCons_time.py
index 806d7ca..2ce4b69 100644
--- a/QMTest/TestSCons_time.py
+++ b/QMTest/TestSCons_time.py
@@ -11,9 +11,9 @@ from those classes, as well as any overridden or additional methods or
 attributes defined in this subclass.
 """
 
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
+# Copyright (c) 2001 - 2014 The SCons Foundation
 
-__revision__ = "QMTest/TestSCons_time.py  2014/03/02 14:18:15 garyo"
+__revision__ = "QMTest/TestSCons_time.py  2014/07/05 09:42:21 garyo"
 
 import os
 import os.path
diff --git a/QMTest/TestSConsign.py b/QMTest/TestSConsign.py
index fe86173..579cb4b 100644
--- a/QMTest/TestSConsign.py
+++ b/QMTest/TestSConsign.py
@@ -1,6 +1,6 @@
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
+# Copyright (c) 2001 - 2014 The SCons Foundation
 
-__revision__ = "QMTest/TestSConsign.py  2014/03/02 14:18:15 garyo"
+__revision__ = "QMTest/TestSConsign.py  2014/07/05 09:42:21 garyo"
 
 __doc__ = """
 TestSConsign.py:  a testing framework for the "sconsign" script 
diff --git a/QMTest/scons_tdb.py b/QMTest/scons_tdb.py
index 7ea2202..fa48c50 100644
--- a/QMTest/scons_tdb.py
+++ b/QMTest/scons_tdb.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
+# Copyright (c) 2001 - 2014 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -28,7 +28,7 @@ QMTest classes to support SCons' testing and Aegis-inspired workflow.
 Thanks to Stefan Seefeld for the initial code.
 """
 
-__revision__ = "QMTest/scons_tdb.py  2014/03/02 14:18:15 garyo"
+__revision__ = "QMTest/scons_tdb.py  2014/07/05 09:42:21 garyo"
 
 ########################################################################
 # Imports