Cleanups in tests and in framework

* Some Py2/Py3 compat blocks were simplified to Py3 only
* some sequences of define-cleaup-function + atexit.register
  were changed to use the decorator (this works if func needs to
  take no arguments)
* Lightly update a bunch of docstrings in TestCmd, and reformat
  a few places, towards the style we're generally using now.
* call_python() in TestCmdTests was modernized to use subprocess.run

Signed-off-by: Mats Wichmann <mats@linux.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/test/SConscript/SConscript.py b/test/SConscript/SConscript.py
index fd8511d..a9ede48 100644
--- a/test/SConscript/SConscript.py
+++ b/test/SConscript/SConscript.py
@@ -34,6 +34,7 @@ test.write('foo.py', "foo = 4\n")
 test.write('SConstruct', """\
 import os
 import foo
+from collections import UserList
 
 assert foo.foo == 4
 
@@ -71,10 +72,6 @@ assert foo == "subdir/SConscript foo"
 
 SConscript('SConscript5')
 
-try:
-    from collections import UserList
-except ImportError:
-    from UserList import UserList
 x7 = "SConstruct x7"
 x8 = "SConstruct x8"
 x9 = SConscript('SConscript6', UserList(["x7", "x8"]))