Cleanup the helper scripts

* Remove from __future__ import print_function, because we
  no longer support Python2.
* Clean out unused parts of tools/scripts/scriptCommon.py
* Move appveyorMergeCoverageScript to Python3
* Update user reporting in *release scripts
* Cleanup module imports

12 files changed, 5 insertions, 49 deletions

diff --git a/tools/misc/appveyorMergeCoverageScript.py b/tools/misc/appveyorMergeCoverageScript.py
index 7cf408d2..5b71f6e1 100644
--- a/tools/misc/appveyorMergeCoverageScript.py
+++ b/tools/misc/appveyorMergeCoverageScript.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 import glob
 import subprocess
diff --git a/tools/scripts/approvalTests.py b/tools/scripts/approvalTests.py
index 9731b9d4..592be36e 100755
--- a/tools/scripts/approvalTests.py
+++ b/tools/scripts/approvalTests.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
-
 import io
 import os
 import sys
diff --git a/tools/scripts/approve.py b/tools/scripts/approve.py
index 997b8c71..6d73be5c 100755
--- a/tools/scripts/approve.py
+++ b/tools/scripts/approve.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 
-from  __future__ import  print_function
-
 import os
 import sys
 import shutil
diff --git a/tools/scripts/developBuild.py b/tools/scripts/developBuild.py
index 9252c7d6..8837770c 100755
--- a/tools/scripts/developBuild.py
+++ b/tools/scripts/developBuild.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
 
-from  __future__ import  print_function
 import releaseCommon
 
 v = releaseCommon.Version()
 v.incrementBuildNumber()
 releaseCommon.performUpdates(v)
 
-print( "Updated Version.hpp, README and Conan to v{0}".format( v.getVersionString() ) )
+print( "Updated files to v{0}".format( v.getVersionString() ) )
diff --git a/tools/scripts/extractFeaturesFromReleaseNotes.py b/tools/scripts/extractFeaturesFromReleaseNotes.py
index 11f4955c..d8be0437 100644
--- a/tools/scripts/extractFeaturesFromReleaseNotes.py
+++ b/tools/scripts/extractFeaturesFromReleaseNotes.py
@@ -21,8 +21,6 @@
 #   to add the 'Introduced in Catch ...' snippets to the relevant pages.
 #
 
-from __future__ import print_function
-
 import re
 
 
diff --git a/tools/scripts/fixWhitespace.py b/tools/scripts/fixWhitespace.py
index 4591c1c4..5840e790 100755
--- a/tools/scripts/fixWhitespace.py
+++ b/tools/scripts/fixWhitespace.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from  __future__ import  print_function
 import os
 from scriptCommon import catchPath
 
diff --git a/tools/scripts/majorRelease.py b/tools/scripts/majorRelease.py
index e9e285a8..eb712b46 100755
--- a/tools/scripts/majorRelease.py
+++ b/tools/scripts/majorRelease.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
 
-from  __future__ import  print_function
 import releaseCommon
 
 v = releaseCommon.Version()
 v.incrementMajorVersion()
 releaseCommon.performUpdates(v)
 
-print( "Updated Version.hpp, README and Conan to v{0}".format( v.getVersionString() ) )
+print( "Updated files to v{0}".format( v.getVersionString() ) )
diff --git a/tools/scripts/minorRelease.py b/tools/scripts/minorRelease.py
index 2b57c2ea..0992c8fb 100755
--- a/tools/scripts/minorRelease.py
+++ b/tools/scripts/minorRelease.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
 
-from  __future__ import  print_function
 import releaseCommon
 
 v = releaseCommon.Version()
 v.incrementMinorVersion()
 releaseCommon.performUpdates(v)
 
-print( "Updated Version.hpp, README and Conan to v{0}".format( v.getVersionString() ) )
+print( "Updated files to v{0}".format( v.getVersionString() ) )
diff --git a/tools/scripts/patchRelease.py b/tools/scripts/patchRelease.py
index d20db714..48256c15 100755
--- a/tools/scripts/patchRelease.py
+++ b/tools/scripts/patchRelease.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
 
-from  __future__ import  print_function
 import releaseCommon
 
 v = releaseCommon.Version()
 v.incrementPatchNumber()
 releaseCommon.performUpdates(v)
 
-print( "Updated Version.hpp, README and Conan to v{0}".format( v.getVersionString() ) )
+print( "Updated files to v{0}".format( v.getVersionString() ) )
diff --git a/tools/scripts/releaseCommon.py b/tools/scripts/releaseCommon.py
index 4d73431c..0d995eaf 100644
--- a/tools/scripts/releaseCommon.py
+++ b/tools/scripts/releaseCommon.py
@@ -1,10 +1,6 @@
-from  __future__ import  print_function
-
 import os
-import sys
 import re
 import string
-import glob
 import fnmatch
 
 from scriptCommon import catchPath
diff --git a/tools/scripts/scriptCommon.py b/tools/scripts/scriptCommon.py
index a6930063..5894185d 100644
--- a/tools/scripts/scriptCommon.py
+++ b/tools/scripts/scriptCommon.py
@@ -1,31 +1,4 @@
 import os
 import sys
-import subprocess
-
 
 catchPath = os.path.dirname(os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0]))))
-
-def getBuildExecutable():
-    if os.name == 'nt':
-        dir = os.environ.get('CATCH_DEV_OUT_DIR', "cmake-build-debug/projects/SelfTest.exe")
-        return dir
-    else:
-        dir = os.environ.get('CATCH_DEV_OUT_DIR', "cmake-build-debug/projects/SelfTest")
-        return dir
-
-
-def runAndCapture( args ):
-    child = subprocess.Popen(" ".join( args ), shell=True, stdout=subprocess.PIPE)
-    lines = []
-    line = ""
-    while True:
-        out = child.stdout.read(1)
-        if out == '' and child.poll():
-            break
-        if out != '':
-            if out == '\n':
-                lines.append( line )
-                line = ""
-            else:
-                line = line + out
-    return lines
diff --git a/tools/scripts/updateDocumentToC.py b/tools/scripts/updateDocumentToC.py
index 41b48752..7b56cfc7 100755
--- a/tools/scripts/updateDocumentToC.py
+++ b/tools/scripts/updateDocumentToC.py
@@ -11,8 +11,6 @@
 # https://github.com/rasbt/markdown-toclify
 #
 
-from  __future__  import print_function
-
 import argparse
 import glob
 import os