rm-py2: Remove "from __future__" from more places

A couple of minor reformats along the way, most prominently, in tests,
if being edited anyway, make sure the docstring most tests have is
actually the docstring (sometimes the __revision__ line came before,
which makes the string not be the docstring).

Snuck in some minor framework changes that were orphaned when another
draft PR was not needed:  this almost all docstring changes, the
functional part is using casefold instead of lower in a match func -
a slightly better approach which is now possible that Py2 compatibility
is not needed.

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

1 files changed, 2 insertions, 6 deletions

diff --git a/test/VariantDir/reflect.py b/test/VariantDir/reflect.py
index 72f3af7..56b0c18 100644
--- a/test/VariantDir/reflect.py
+++ b/test/VariantDir/reflect.py
@@ -20,9 +20,6 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
 This test validates the correct operation of a VariantDir specification
@@ -33,6 +30,8 @@ in the variant_dir as sources for that same build dir.
 Test based on bug #1055521 filed by Gary Oberbrunner.
 """
 
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
 import os.path
 import re
 
@@ -44,14 +43,11 @@ _python_ = TestSCons._python_
 re_python = re.escape(TestSCons._python_)
 
 test.write("mycc.py", """
-from __future__ import print_function
 
 print('Compile')
 """)
 
 test.write("mylink.py", """
-from __future__ import print_function
-
 print('Link')
 """)