Merge branch 'master' into topic/grossag/newhashes

3 files changed, 6 insertions, 24 deletions

diff --git a/test/option/debug-count.py b/test/option/debug-count.py
index f2fceb4..cf46feb 100644
--- a/test/option/debug-count.py
+++ b/test/option/debug-count.py
@@ -34,13 +34,6 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-try:
-    import weakref
-except ImportError:
-    x = "Python version has no 'weakref' module; skipping tests.\n"
-    test.skip_test(x)
-
-
 
 test.write('SConstruct', """
 DefaultEnvironment(tools=[])
diff --git a/test/option/debug-memory.py b/test/option/debug-memory.py
index bf720cc..2958e0b 100644
--- a/test/option/debug-memory.py
+++ b/test/option/debug-memory.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
+# MIT License
 #
-# __COPYRIGHT__
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,8 +23,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
 """
 Test that the --debug=memory option works.
 """
@@ -31,21 +30,18 @@ Test that the --debug=memory option works.
 import re
 
 import TestSCons
+from TestCmd import IS_WINDOWS
 
 test = TestSCons.TestSCons()
 
-try:
-    import resource
-except ImportError:
+if not IS_WINDOWS:
     try:
-        import win32process
-        import win32api
+        import resource  # noqa: F401
     except ImportError:
-        x = "Python version has no 'resource' or 'win32api/win32process' module; skipping tests.\n"
+        x = "Python version has no 'resource' skipping tests.\n"
         test.skip_test(x)
 
 
-
 test.write('SConstruct', """
 DefaultEnvironment(tools=[])
 def cat(target, source, env):
diff --git a/test/option/debug-objects.py b/test/option/debug-objects.py
index beec4b7..9c8536c 100644
--- a/test/option/debug-objects.py
+++ b/test/option/debug-objects.py
@@ -32,13 +32,6 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-try:
-    import weakref
-except ImportError:
-    x = "Python version has no 'weakref' module; skipping tests.\n"
-    test.skip_test(x)
-
-
 
 test.write('SConstruct', """
 DefaultEnvironment(tools=[])