[PY 3.8] test fixes for file closings, rawstrings

On a linux host (missing some things that may be on the Travis CI
setup), Py3.8a3 now shows 19 fails, 1048 pass, with 84 Warning: messages.

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

58 files changed, 187 insertions, 188 deletions

diff --git a/test/TEX/LATEX.py b/test/TEX/LATEX.py
index dc5e535..553313e 100644
--- a/test/TEX/LATEX.py
+++ b/test/TEX/LATEX.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that we can set the LATEX string to our own utility, that
 the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
@@ -44,15 +44,16 @@ import os
 import getopt
 cmd_opts, arg = getopt.getopt(sys.argv[1:], 'i:r:', [])
 base_name = os.path.splitext(arg[0])[0]
-infile = open(arg[0], 'r')
-dvi_file = open(base_name+'.dvi', 'w')
-aux_file = open(base_name+'.aux', 'w')
-log_file = open(base_name+'.log', 'w')
-for l in infile.readlines():
-    if l[0] != '\\':
-        dvi_file.write(l)
-        aux_file.write(l)
-        log_file.write(l)
+with open(arg[0], 'r') as ifp:
+    with open(base_name+'.dvi', 'w') as dvi_file, \
+         open(base_name+'.aux', 'w') as aux_file, \
+         open(base_name+'.log', 'w') as log_file:
+
+        for l in ifp.readlines():
+            if l[0] != '\\':
+                dvi_file.write(l)
+                aux_file.write(l)
+                log_file.write(l)
 sys.exit(0)
 """)
 
diff --git a/test/TEX/LATEX2.py b/test/TEX/LATEX2.py
index 566f164..a3ac125 100644
--- a/test/TEX/LATEX2.py
+++ b/test/TEX/LATEX2.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that we can produce several .pdf at once from several sources.
 """
 
diff --git a/test/TEX/LATEXCOM.py b/test/TEX/LATEXCOM.py
index 878d4cf..8ea87c8 100644
--- a/test/TEX/LATEXCOM.py
+++ b/test/TEX/LATEXCOM.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test the ability to configure the $LATEXCOM construction variable.
 """
 
diff --git a/test/TEX/LATEXCOMSTR.py b/test/TEX/LATEXCOMSTR.py
index f8a377d..41c5dc7 100644
--- a/test/TEX/LATEXCOMSTR.py
+++ b/test/TEX/LATEXCOMSTR.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test that the $LATEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
diff --git a/test/TEX/LATEXFLAGS.py b/test/TEX/LATEXFLAGS.py
index 48cfa9c..5e8b4af 100644
--- a/test/TEX/LATEXFLAGS.py
+++ b/test/TEX/LATEXFLAGS.py
@@ -43,12 +43,11 @@ opt_string = ''
 for opt, arg in cmd_opts:
     opt_string = opt_string + ' ' + opt
 base_name = os.path.splitext(args[0])[0]
-infile = open(args[0], 'r')
-out_file = open(base_name+'.dvi', 'w')
-out_file.write(opt_string + "\n")
-for l in infile.readlines():
-    if l[0] != '\\':
-        out_file.write(l)
+with open(base_name+'.dvi', 'w') as ofp, open(args[0], 'r') as ifp:
+    ofp.write(opt_string + "\n")
+    for l in ifp.readlines():
+        if l[0] != '\\':
+            ofp.write(l)
 sys.exit(0)
 """)
 
diff --git a/test/TEX/PDFLATEX.py b/test/TEX/PDFLATEX.py
index dece385..a350b28 100644
--- a/test/TEX/PDFLATEX.py
+++ b/test/TEX/PDFLATEX.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that we can set the PDFLATEX string to our own utility, that
 the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
@@ -44,15 +44,16 @@ import os
 import getopt
 cmd_opts, arg = getopt.getopt(sys.argv[1:], 'i:r:', [])
 base_name = os.path.splitext(arg[0])[0]
-infile = open(arg[0], 'rb')
-pdf_file = open(base_name+'.pdf', 'wb')
-aux_file = open(base_name+'.aux', 'wb')
-log_file = open(base_name+'.log', 'wb')
-for l in infile.readlines():
-    if l[0] != '\\':
-        pdf_file.write(l)
-        aux_file.write(l)
-        log_file.write(l)
+with open(arg[0], 'r') as ifp:
+    with open(base_name+'.pdf', 'w') as pdf_file, \
+         open(base_name+'.aux', 'w') as aux_file, \
+         open(base_name+'.log', 'w') as log_file:
+
+        for l in ifp.readlines():
+            if l[0] != '\\':
+                pdf_file.write(l)
+                aux_file.write(l)
+                log_file.write(l)
 sys.exit(0)
 """)
 
diff --git a/test/TEX/PDFLATEXCOM.py b/test/TEX/PDFLATEXCOM.py
index c2b54ce..5e9d68d 100644
--- a/test/TEX/PDFLATEXCOM.py
+++ b/test/TEX/PDFLATEXCOM.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test the ability to configure the $PDFLATEXCOM construction variable.
 """
 
diff --git a/test/TEX/PDFLATEXCOMSTR.py b/test/TEX/PDFLATEXCOMSTR.py
index 1d911bd..d695bde 100644
--- a/test/TEX/PDFLATEXCOMSTR.py
+++ b/test/TEX/PDFLATEXCOMSTR.py
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env python
 #
 # __COPYRIGHT__
@@ -25,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test that the $PDFLATEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
diff --git a/test/TEX/PDFLATEXFLAGS.py b/test/TEX/PDFLATEXFLAGS.py
index 47643e4..9bea1f0 100644
--- a/test/TEX/PDFLATEXFLAGS.py
+++ b/test/TEX/PDFLATEXFLAGS.py
@@ -43,12 +43,11 @@ opt_string = ''
 for opt, arg in cmd_opts:
     opt_string = opt_string + ' ' + opt
 base_name = os.path.splitext(args[0])[0]
-infile = open(args[0], 'r')
-out_file = open(base_name+'.pdf', 'w')
-out_file.write(opt_string + "\n")
-for l in infile.readlines():
-    if l[0] != '\\':
-        out_file.write(l)
+with open(base_name+'.pdf', 'w') as ofp, open(args[0], 'r') as ifp:
+    ofp.write(opt_string + "\n")
+    for l in ifp.readlines():
+        if l[0] != '\\':
+            ofp.write(l)
 sys.exit(0)
 """)
 
diff --git a/test/TEX/PDFTEX.py b/test/TEX/PDFTEX.py
index 5a958d5..0309fce 100644
--- a/test/TEX/PDFTEX.py
+++ b/test/TEX/PDFTEX.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that we can set the PDFTEX string to our own utility, that
 the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
@@ -44,15 +44,16 @@ import os
 import getopt
 cmd_opts, arg = getopt.getopt(sys.argv[2:], 'i:r:', [])
 base_name = os.path.splitext(arg[0])[0]
-infile = open(arg[0], 'rb')
-pdf_file = open(base_name+'.pdf', 'wb')
-aux_file = open(base_name+'.aux', 'wb')
-log_file = open(base_name+'.log', 'wb')
-for l in infile.readlines():
-    if l[0] != '\\':
-        pdf_file.write(l)
-        aux_file.write(l)
-        log_file.write(l)
+with open(arg[0], 'r') as ifp:
+    with open(base_name+'.pdf', 'w') as pdf_file, \
+         open(base_name+'.aux', 'w') as aux_file, \
+         open(base_name+'.log', 'w') as log_file:
+
+        for l in ifp.readlines():
+            if l[0] != '\\':
+                pdf_file.write(l)
+                aux_file.write(l)
+                log_file.write(l)
 sys.exit(0)
 """)
 
diff --git a/test/TEX/PDFTEXCOM.py b/test/TEX/PDFTEXCOM.py
index 6e915a4..fd0ba69 100644
--- a/test/TEX/PDFTEXCOM.py
+++ b/test/TEX/PDFTEXCOM.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test the ability to configure the $PDFTEXCOM construction variable.
 """
 
diff --git a/test/TEX/PDFTEXCOMSTR.py b/test/TEX/PDFTEXCOMSTR.py
index 7ee5b41..50edd28 100644
--- a/test/TEX/PDFTEXCOMSTR.py
+++ b/test/TEX/PDFTEXCOMSTR.py
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env python
 #
 # __COPYRIGHT__
@@ -25,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test that the $PDFTEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
diff --git a/test/TEX/PDFTEXFLAGS.py b/test/TEX/PDFTEXFLAGS.py
index 97b352e..c9fcdca 100644
--- a/test/TEX/PDFTEXFLAGS.py
+++ b/test/TEX/PDFTEXFLAGS.py
@@ -43,12 +43,11 @@ opt_string = ''
 for opt, arg in cmd_opts:
     opt_string = opt_string + ' ' + opt
 base_name = os.path.splitext(args[0])[0]
-infile = open(args[0], 'r')
-out_file = open(base_name+'.pdf', 'w')
-out_file.write(opt_string + "\n")
-for l in infile.readlines():
-    if l[0] != '\\':
-        out_file.write(l)
+with open(base_name+'.pdf', 'w') as ofp, open(args[0], 'r') as ifp:
+    ofp.write(opt_string + "\n")
+    for l in ifp.readlines():
+        if l[0] != '\\':
+            ofp.write(l)
 sys.exit(0)
 """)
 
diff --git a/test/TEX/PDF_single_source.py b/test/TEX/PDF_single_source.py
index aefdd3e..cd11234 100644
--- a/test/TEX/PDF_single_source.py
+++ b/test/TEX/PDF_single_source.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a mulitple pdf's from a list of PostScript files.
 
 Test courtesy Rob Managan.
@@ -108,7 +108,7 @@ $F2psBegin
  0.06299 0.06299 sc
 %
 % Fig objects follow
-% 
+%
 7.500 slw
 % Ellipse
 n 1170 945 766 766 0 360 DrawEllipse gs col0 s gr
diff --git a/test/TEX/TEX.py b/test/TEX/TEX.py
index 7b20106..3964eb8 100644
--- a/test/TEX/TEX.py
+++ b/test/TEX/TEX.py
@@ -24,7 +24,7 @@ from __future__ import print_function
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that we can set the TEX string to our own utility, that
 the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
@@ -47,15 +47,16 @@ import os
 import getopt
 cmd_opts, arg = getopt.getopt(sys.argv[1:], 'i:r:', [])
 base_name = os.path.splitext(arg[0])[0]
-infile = open(arg[0], 'r')
-dvi_file = open(base_name+'.dvi', 'w')
-aux_file = open(base_name+'.aux', 'w')
-log_file = open(base_name+'.log', 'w')
-for l in infile.readlines():
-    if l[0] != '\\':
-        dvi_file.write(l)
-        aux_file.write(l)
-        log_file.write(l)
+with open(arg[0], 'r') as ifp:
+    with open(base_name+'.dvi', 'w') as dvi_file, \
+         open(base_name+'.aux', 'w') as aux_file, \
+         open(base_name+'.log', 'w') as log_file:
+
+        for l in ifp.readlines():
+            if l[0] != '\\':
+                dvi_file.write(l)
+                aux_file.write(l)
+                log_file.write(l)
 sys.exit(0)
 """)
 
diff --git a/test/TEX/TEXCOM.py b/test/TEX/TEXCOM.py
index 9d820bc..10da59e 100644
--- a/test/TEX/TEXCOM.py
+++ b/test/TEX/TEXCOM.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test the ability to configure the $TEXCOM construction variable.
 """
 
diff --git a/test/TEX/TEXCOMSTR.py b/test/TEX/TEXCOMSTR.py
index 0facc6f..9dbba13 100644
--- a/test/TEX/TEXCOMSTR.py
+++ b/test/TEX/TEXCOMSTR.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test that the $TEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
diff --git a/test/TEX/TEXFLAGS.py b/test/TEX/TEXFLAGS.py
index 7b4fd15..287b537 100644
--- a/test/TEX/TEXFLAGS.py
+++ b/test/TEX/TEXFLAGS.py
@@ -43,12 +43,11 @@ opt_string = ''
 for opt, arg in cmd_opts:
     opt_string = opt_string + ' ' + opt
 base_name = os.path.splitext(args[0])[0]
-infile = open(args[0], 'r')
-out_file = open(base_name+'.dvi', 'w')
-out_file.write(opt_string + "\n")
-for l in infile.readlines():
-    if l[0] != '\\':
-        out_file.write(l)
+with open(base_name+'.dvi', 'w') as ofp, open(args[0], 'r') as ifp:
+    ofp.write(opt_string + "\n")
+    for l in ifp.readlines():
+        if l[0] != '\\':
+            ofp.write(l)
 sys.exit(0)
 """)
 
diff --git a/test/TEX/auxiliaries.py b/test/TEX/auxiliaries.py
index 8d220c5..e28c212 100644
--- a/test/TEX/auxiliaries.py
+++ b/test/TEX/auxiliaries.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Verify that sections of LaTeX output that use auxiliary files (a
 bibliography in our configuration below) are consistent when re-run
 after modifying the input file.
diff --git a/test/TEX/biber_biblatex.py b/test/TEX/biber_biblatex.py
index b4a4969..6ee8121 100755
--- a/test/TEX/biber_biblatex.py
+++ b/test/TEX/biber_biblatex.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a Tex document that uses the multibib oackage
 
 Test courtesy Rob Managan.
diff --git a/test/TEX/biber_biblatex2.py b/test/TEX/biber_biblatex2.py
index e9893ee..61fafcf 100644
--- a/test/TEX/biber_biblatex2.py
+++ b/test/TEX/biber_biblatex2.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a Tex document that uses the biblatex package
 It uses the default backend, could be bibtex or biber. 
 Require both be installed
diff --git a/test/TEX/biblatex.py b/test/TEX/biblatex.py
index 21e1a93..bb88aaa 100755
--- a/test/TEX/biblatex.py
+++ b/test/TEX/biblatex.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a Tex document that uses the biblatex package
 
 Test courtesy Rob Managan.
diff --git a/test/TEX/biblatex_plain.py b/test/TEX/biblatex_plain.py
index 06b3cc6..5cad924 100644
--- a/test/TEX/biblatex_plain.py
+++ b/test/TEX/biblatex_plain.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a Tex document that uses the biblatex package
 
 Test courtesy Rob Managan.
diff --git a/test/TEX/bibliography.py b/test/TEX/bibliography.py
index 9e79320..a8032db 100644
--- a/test/TEX/bibliography.py
+++ b/test/TEX/bibliography.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that use of \bibliography in TeX source files causes SCons to
 be aware of the necessary created bibliography files.
 
@@ -48,7 +48,7 @@ have_latex = test.where_is('latex')
 if not have_latex:
     test.skip_test('Could not find latex; skipping test(s).\n')
 
-    
+
 test.write('SConstruct', """\
 import os
 env = Environment(tools = ['tex', 'latex', 'dvips'])
diff --git a/test/TEX/bibtex-latex-rerun.py b/test/TEX/bibtex-latex-rerun.py
index a2538f1..300f03b 100644
--- a/test/TEX/bibtex-latex-rerun.py
+++ b/test/TEX/bibtex-latex-rerun.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Verify that we re-run LaTeX after running BibTeX in response to
 changes in a .bib file.
 
diff --git a/test/TEX/clean.py b/test/TEX/clean.py
index b0e5ee4..ad828d2 100644
--- a/test/TEX/clean.py
+++ b/test/TEX/clean.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Check that all auxilary files created by LaTeX are properly cleaned by scons -c.
 """
 
diff --git a/test/TEX/configure.py b/test/TEX/configure.py
index 60ebb9c..763f86f 100644
--- a/test/TEX/configure.py
+++ b/test/TEX/configure.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Verify execution of custom test case.
 The old code base would not be able to fail the test
 """
diff --git a/test/TEX/dryrun.py b/test/TEX/dryrun.py
index 308e167..4265791 100644
--- a/test/TEX/dryrun.py
+++ b/test/TEX/dryrun.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that we can set the LATEX string to our own utility, that
 the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
diff --git a/test/TEX/eps_graphics.py b/test/TEX/eps_graphics.py
index e0a8731..9e36148 100644
--- a/test/TEX/eps_graphics.py
+++ b/test/TEX/eps_graphics.py
@@ -24,8 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
-Test creation of a Tex document with nested includes in a 
+r"""
+Test creation of a Tex document with nested includes in a
 subdir that needs to create a fig.pdf.
 
 Test courtesy Rob Managan.
@@ -115,7 +115,7 @@ $F2psBegin
  0.06299 0.06299 sc
 %
 % Fig objects follow
-% 
+%
 7.500 slw
 % Ellipse
 n 1170 945 766 766 0 360 DrawEllipse gs col0 s gr
@@ -133,13 +133,13 @@ r"""\documentclass{report}
 \usepackage{epsfig,color} % for .tex version of figures if we go that way
 
 \begin{document}
- 
+
 \title{Report Title}
 
 \author{A. N. Author}
- 
-\maketitle 
- 
+
+\maketitle
+
 \begin{abstract}
 there is no abstract
 \end{abstract}
@@ -150,7 +150,7 @@ The introduction is short.
 
 \section{Acknowledgements}
 
-The Acknowledgements are shown as well.  
+The Acknowledgements are shown as well.
 
 To get a hard copy of this report call me.
 
diff --git a/test/TEX/eps_graphics2.py b/test/TEX/eps_graphics2.py
index e523df7..19ea98b 100644
--- a/test/TEX/eps_graphics2.py
+++ b/test/TEX/eps_graphics2.py
@@ -24,8 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
-Test creation of a Tex document with nested includes in a 
+r"""
+Test creation of a Tex document with nested includes in a
 subdir that needs to create a fig.pdf.
 Test creation with pdflatex
 
@@ -117,7 +117,7 @@ $F2psBegin
  0.06299 0.06299 sc
 %
 % Fig objects follow
-% 
+%
 7.500 slw
 % Ellipse
 n 1170 945 766 766 0 360 DrawEllipse gs col0 s gr
@@ -135,13 +135,13 @@ r"""\documentclass{report}
 \usepackage{epsfig,color} % for .tex version of figures if we go that way
 
 \begin{document}
- 
+
 \title{Report Title}
 
 \author{A. N. Author}
- 
-\maketitle 
- 
+
+\maketitle
+
 \begin{abstract}
 there is no abstract
 \end{abstract}
@@ -152,14 +152,14 @@ The introduction is short.
 
 \section{Acknowledgements}
 
-The Acknowledgements are shown as well.  
+The Acknowledgements are shown as well.
 
 To get a hard copy of this report call me.
 
 \begin{figure}[htbp]
 \begin{center}
-\includegraphics 
- [width=.5\textwidth] 
+\includegraphics
+ [width=.5\textwidth]
  {Fig1}
 \caption{Zone and Node indexing}
 \label{fig1}
diff --git a/test/TEX/generated_files.py b/test/TEX/generated_files.py
index 0325154..9bafc9b 100644
--- a/test/TEX/generated_files.py
+++ b/test/TEX/generated_files.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a Tex document with generated tex files
 This checks whether the .bbl file is kept as a side effect
 Test creation with pdflatex
diff --git a/test/TEX/glossaries.py b/test/TEX/glossaries.py
index 05ddf12..21180a0 100644
--- a/test/TEX/glossaries.py
+++ b/test/TEX/glossaries.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that use of \glossaries in TeX source files causes SCons to
 be aware of the necessary created glossary files.
 
diff --git a/test/TEX/glossary.py b/test/TEX/glossary.py
index be0a870..0becb40 100644
--- a/test/TEX/glossary.py
+++ b/test/TEX/glossary.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that use of \glossary in TeX source files causes SCons to
 be aware of the necessary created glossary files.
 
diff --git a/test/TEX/input_docClass.py b/test/TEX/input_docClass.py
index 3fa2b08..413cba5 100644
--- a/test/TEX/input_docClass.py
+++ b/test/TEX/input_docClass.py
@@ -24,9 +24,9 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a LaTeX document that uses \input{filename}
-to set the documentclass. When the file has .tex we have to search 
+to set the documentclass. When the file has .tex we have to search
 to find the documentclass command.
 
 Test courtesy Rob Managan.
@@ -53,13 +53,13 @@ r"""
 \input{theClass}
 
 \begin{document}
- 
+
 \title{Report Title}
 
 \author{A. N. Author}
- 
-\maketitle 
- 
+
+\maketitle
+
 \begin{abstract}
 there is no abstract
 \end{abstract}
@@ -73,7 +73,7 @@ The introduction is short.
 
 \section{Acknowledgements}
 
-The Acknowledgements are shown as well.  
+The Acknowledgements are shown as well.
 
 \end{document}
 """)
diff --git a/test/TEX/lstinputlisting.py b/test/TEX/lstinputlisting.py
index fcfe5a8..1d60df7 100644
--- a/test/TEX/lstinputlisting.py
+++ b/test/TEX/lstinputlisting.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Verify that we re-run LaTeX when a source file in \lstinputlisting
 changes.
 
diff --git a/test/TEX/makeindex.py b/test/TEX/makeindex.py
index 638224a..960ed68 100644
--- a/test/TEX/makeindex.py
+++ b/test/TEX/makeindex.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that use of \makeindex in TeX source files causes SCons to be
 aware of the necessary created index files.
 
diff --git a/test/TEX/multi-line_include_options.py b/test/TEX/multi-line_include_options.py
index 5266455..bb8a5f2 100644
--- a/test/TEX/multi-line_include_options.py
+++ b/test/TEX/multi-line_include_options.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 When an inclusion's optional argument (enclosed in square brackets:
 []) spans multiple lines (via comment wrapping), ensure that the LaTeX
 Scanner doesn't throw an IndexError.
diff --git a/test/TEX/multi-run.py b/test/TEX/multi-run.py
index ff4e82a..9de0da4 100644
--- a/test/TEX/multi-run.py
+++ b/test/TEX/multi-run.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that both .tex and .ltx files can handle a LaTeX-style
 bibliography (by calling $BIBTEX to generate a .bbl file) and
 correctly re-run to resolve undefined references.
diff --git a/test/TEX/multibib.py b/test/TEX/multibib.py
index cdb9b87..114ade6 100644
--- a/test/TEX/multibib.py
+++ b/test/TEX/multibib.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a Tex document that uses the multibib oackage
 
 Test courtesy Rob Managan.
diff --git a/test/TEX/multiple_include.py b/test/TEX/multiple_include.py
index 0480d45..76a95e2 100644
--- a/test/TEX/multiple_include.py
+++ b/test/TEX/multiple_include.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a fully-featured TeX document (with bibliography
 and index) in a variant_dir.
 
@@ -116,7 +116,7 @@ $F2psBegin
  0.06299 0.06299 sc
 %
 % Fig objects follow
-% 
+%
 7.500 slw
 % Ellipse
 n 1170 945 766 766 0 360 DrawEllipse gs col0 s gr
@@ -155,13 +155,13 @@ r"""\documentclass{report}
 \makeindex
 
 \begin{document}
- 
+
 \title{Report Title}
 
 \author{A. N. Author}
- 
-\maketitle 
- 
+
+\maketitle
+
 \begin{abstract}
 there is no abstract
 \end{abstract}
@@ -177,7 +177,7 @@ The introduction is short.
 
 \section{Acknowledgements}
 
-The Acknowledgements are shown as well.  
+The Acknowledgements are shown as well.
 
 \index{Getting the Report}
 
diff --git a/test/TEX/multiple_include_subdir.py b/test/TEX/multiple_include_subdir.py
index ade4713..589aa06 100644
--- a/test/TEX/multiple_include_subdir.py
+++ b/test/TEX/multiple_include_subdir.py
@@ -24,8 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
-Test creation of a Tex document with nested includes in a 
+r"""
+Test creation of a Tex document with nested includes in a
 subdir that needs to create a fig.pdf.
 
 Test courtesy Rob Managan.
@@ -116,7 +116,7 @@ $F2psBegin
  0.06299 0.06299 sc
 %
 % Fig objects follow
-% 
+%
 7.500 slw
 % Ellipse
 n 1170 945 766 766 0 360 DrawEllipse gs col0 s gr
@@ -155,13 +155,13 @@ r"""\documentclass{report}
 \makeindex
 
 \begin{document}
- 
+
 \title{Report Title}
 
 \author{A. N. Author}
- 
-\maketitle 
- 
+
+\maketitle
+
 \begin{abstract}
 there is no abstract
 \end{abstract}
@@ -177,7 +177,7 @@ The introduction is short.
 
 \section{Acknowledgements}
 
-The Acknowledgements are shown as well.  
+The Acknowledgements are shown as well.
 
 \index{Getting the Report}
 
diff --git a/test/TEX/newglossary.py b/test/TEX/newglossary.py
index 12c68a7..faae7d3 100644
--- a/test/TEX/newglossary.py
+++ b/test/TEX/newglossary.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that use of \newglossary in TeX source files causes SCons to
 be aware of the necessary created glossary files.
 
@@ -72,7 +72,7 @@ test.write('newglossary.tex', r"""
 
 \newacronym{gnu}{GNU}{GNU's Not UNIX}
 \makeglossaries
-\glstoctrue 
+\glstoctrue
 %\loadglsentries[\acronymtype]{chapters/acronyms}
 \loadglsentries[symbol]{symbols}
 %\loadglsentries[definition]{defns}
@@ -97,7 +97,7 @@ a definition \gls{defPower}
 
 
 test.write('symbols.tex', r"""
-\newglossaryentry{mel}{name={Microelectronic Fundamentals},description={\nopostdesc},sort=d}  
+\newglossaryentry{mel}{name={Microelectronic Fundamentals},description={\nopostdesc},sort=d}
 \newsym{dynPower}{P_{dyn}}{P}{Dynamic power consumption}{mel}
 
 %\newcommand{\newsym}[5]{\newglossaryentry{#1}{name=\ensuremath{#2},description={\symtab{#2}{#4}},parent={#5},sort={#3}}}
diff --git a/test/TEX/nomencl.py b/test/TEX/nomencl.py
index 1c121c0..7afb84b 100644
--- a/test/TEX/nomencl.py
+++ b/test/TEX/nomencl.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that use of \nomencl in TeX source files causes SCons to
 be aware of the necessary created glossary files.
 
@@ -65,7 +65,7 @@ test.write('nomencl.tex', r"""
 
 \begin{document}
 
-A nomenclature entry \nomenclature{gnu}{an animal or software group} 
+A nomenclature entry \nomenclature{gnu}{an animal or software group}
 and another\nomenclature{nix}{not sure}.
 
 %handle old version of nomencl.sty
diff --git a/test/TEX/recursive_scanner_dependencies_import.py b/test/TEX/recursive_scanner_dependencies_import.py
index b31dfbe..c8c6569 100644
--- a/test/TEX/recursive_scanner_dependencies_import.py
+++ b/test/TEX/recursive_scanner_dependencies_import.py
@@ -24,14 +24,14 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""Verify that we re-run LaTeX after changing a nested \import. This
+r"""
+Verify that we re-run LaTeX after changing a nested \import. This
 checks that recursive implicit dependencies are found correctly.
 
 This is a separate test from the
 recursive_scanner_dependencies_input.py test because \input and
 \include are handled specially by the PDF builder, whereas \import
 dependencies are found only by the scanner.
-
 """
 
 import os
diff --git a/test/TEX/recursive_scanner_dependencies_input.py b/test/TEX/recursive_scanner_dependencies_input.py
index 257051e..5f37bf1 100644
--- a/test/TEX/recursive_scanner_dependencies_input.py
+++ b/test/TEX/recursive_scanner_dependencies_input.py
@@ -24,7 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""Verify that we re-run LaTeX after changing a nested \input. This
+r"""
+Verify that we re-run LaTeX after changing a nested \input. This
 checks that recursive implicit dependencies are found correctly.
 """
 
diff --git a/test/TEX/rename_result.py b/test/TEX/rename_result.py
index f061e26..b06d388 100644
--- a/test/TEX/rename_result.py
+++ b/test/TEX/rename_result.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that we can rename the output from latex to the
 target name provided by the user.
 """
diff --git a/test/TEX/subdir-as-include.py b/test/TEX/subdir-as-include.py
index 8b897ca..bb3f2e5 100755
--- a/test/TEX/subdir-as-include.py
+++ b/test/TEX/subdir-as-include.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 This is an obscure test case. When
   1) a file without a suffix is included in a TeX build and
   2) there is a directory with the same name as that file,
diff --git a/test/TEX/subdir-input.py b/test/TEX/subdir-input.py
index 8c7febe..0d9311e 100644
--- a/test/TEX/subdir-input.py
+++ b/test/TEX/subdir-input.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Verify that we execute TeX in a subdirectory (if that's where the document
 resides) by checking that all the auxiliary files get created there and
 not in the top-level directory.
diff --git a/test/TEX/subdir_variantdir_include.py b/test/TEX/subdir_variantdir_include.py
index 7af3733..a7004b5 100644
--- a/test/TEX/subdir_variantdir_include.py
+++ b/test/TEX/subdir_variantdir_include.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Verify that we execute TeX in a subdirectory (if that's where the document
 resides) by checking that all the auxiliary files get created there and
 not in the top-level directory. Test this when variantDir is used
diff --git a/test/TEX/subdir_variantdir_include2.py b/test/TEX/subdir_variantdir_include2.py
index 4dbc4d2..5a0b49f 100644
--- a/test/TEX/subdir_variantdir_include2.py
+++ b/test/TEX/subdir_variantdir_include2.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Verify that we execute TeX in a subdirectory (if that's where the document
 resides) by checking that all the auxiliary files get created there and
 not in the top-level directory. Test this when variantDir is used
@@ -73,8 +73,8 @@ Hi there.
 \end{document}
 """)
 
-test.write(['docs','content','chapter.tex'], """\
-Sub-document 1
+test.write(['docs','content','chapter.tex'],
+r"""Sub-document 1
 \input{content/subchap}
 
 """)
@@ -87,8 +87,8 @@ Sub-chapter 2
 #test.run(arguments = '.')
 #test.run(arguments = '.', stderr=None, stdout=None)
 
-# next line tests that side effect nodes get disambiguated 
-# and their directories created in a variantDir before 
+# next line tests that side effect nodes get disambiguated
+# and their directories created in a variantDir before
 # the builder tries to populate them and fails
 test.run(arguments = 'build/main.pdf', stderr=None, stdout=None)
 
diff --git a/test/TEX/subdir_variantdir_input.py b/test/TEX/subdir_variantdir_input.py
index efc0692..c817c83 100644
--- a/test/TEX/subdir_variantdir_input.py
+++ b/test/TEX/subdir_variantdir_input.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Verify that we execute TeX in a subdirectory (if that's where the document
 resides) by checking that all the auxiliary files get created there and
 not in the top-level directory. Test this when variantDir is used
diff --git a/test/TEX/synctex.py b/test/TEX/synctex.py
index 867063a..f07db78 100644
--- a/test/TEX/synctex.py
+++ b/test/TEX/synctex.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that use of -synctex command option causes SCons to
 be aware of the created synctex.gz file.
 
diff --git a/test/TEX/usepackage.py b/test/TEX/usepackage.py
index 637956a..0bb8c22 100644
--- a/test/TEX/usepackage.py
+++ b/test/TEX/usepackage.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate that we can set the LATEX string to our own utility, that
 the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
diff --git a/test/TEX/variant_dir.py b/test/TEX/variant_dir.py
index 99c3523..d81f542 100644
--- a/test/TEX/variant_dir.py
+++ b/test/TEX/variant_dir.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a fully-featured TeX document (with bibliography
 and index) in a variant_dir.
 
@@ -122,7 +122,7 @@ $F2psBegin
  0.06299 0.06299 sc
 %
 % Fig objects follow
-% 
+%
 7.500 slw
 % Ellipse
 n 1170 945 766 766 0 360 DrawEllipse gs col0 s gr
@@ -156,10 +156,10 @@ test.write(['docs', 'test.bib'], """\
 %% http://bibdesk.sourceforge.net/
 
 
-%% Created for Rob Managan at 2006-11-15 12:53:16 -0800 
+%% Created for Rob Managan at 2006-11-15 12:53:16 -0800
 
 
-%% Saved with string encoding Western (ASCII) 
+%% Saved with string encoding Western (ASCII)
 
 
 
@@ -184,13 +184,13 @@ r"""\documentclass{report}
 \makeindex
 
 \begin{document}
- 
+
 \title{Report Title}
 
 \author{A. N. Author}
- 
-\maketitle 
- 
+
+\maketitle
+
 \begin{abstract}
 there is no abstract
 \end{abstract}
@@ -206,7 +206,7 @@ The introduction is short.
 
 \section{Acknowledgements}
 
-The Acknowledgements are show as well \cite{Managan:2006fk}.  
+The Acknowledgements are show as well \cite{Managan:2006fk}.
 
 \index{Getting the Report}
 
diff --git a/test/TEX/variant_dir_bibunit.py b/test/TEX/variant_dir_bibunit.py
index ce2c24e..cd3409e 100644
--- a/test/TEX/variant_dir_bibunit.py
+++ b/test/TEX/variant_dir_bibunit.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a fully-featured TeX document (with bibunit
 driven bibliographies) in a variant_dir.
 
diff --git a/test/TEX/variant_dir_dup0.py b/test/TEX/variant_dir_dup0.py
index 25205f8..8f4334f 100644
--- a/test/TEX/variant_dir_dup0.py
+++ b/test/TEX/variant_dir_dup0.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a fully-featured TeX document (with bibliography
 and index) in a variant_dir.
 
@@ -129,7 +129,7 @@ $F2psBegin
  0.06299 0.06299 sc
 %
 % Fig objects follow
-% 
+%
 7.500 slw
 % Ellipse
 n 1170 945 766 766 0 360 DrawEllipse gs col0 s gr
@@ -162,7 +162,7 @@ test.write(['docs', 'test.bib'], """\
 %% This BibTeX bibliography file was created using BibDesk.
 %% http://bibdesk.sourceforge.net/
 
-%% Saved with string encoding Western (ASCII) 
+%% Saved with string encoding Western (ASCII)
 
 @techreport{AnAuthor:2006fk,
 	Author = {A. N. Author},
@@ -185,13 +185,13 @@ r"""\documentclass{report}
 \makeindex
 
 \begin{document}
- 
+
 \title{Report Title}
 
 \author{A. N. Author}
- 
-\maketitle 
- 
+
+\maketitle
+
 \begin{abstract}
 there is no abstract
 \end{abstract}
@@ -207,7 +207,7 @@ The introduction is short.
 
 \section{Acknowledgements}
 
-The Acknowledgements are show as well \cite{AnAuthor:2006fk}.  
+The Acknowledgements are show as well \cite{AnAuthor:2006fk}.
 
 \index{Getting the Report}
 
@@ -242,13 +242,13 @@ r"""\documentclass{report}
 \makeindex
 
 \begin{document}
- 
+
 \title{Report Title}
 
 \author{A. N. Author}
- 
-\maketitle 
- 
+
+\maketitle
+
 \begin{abstract}
 there is no abstract
 \end{abstract}
@@ -264,7 +264,7 @@ The introduction is short.
 
 \section{Acknowledgements}
 
-The Acknowledgements are show as well \cite{AnAuthor:2006fk}.  
+The Acknowledgements are show as well \cite{AnAuthor:2006fk}.
 
 \index{Getting the Report}
 
diff --git a/test/TEX/variant_dir_newglossary.py b/test/TEX/variant_dir_newglossary.py
index 5a28ed4..1e6ab43 100644
--- a/test/TEX/variant_dir_newglossary.py
+++ b/test/TEX/variant_dir_newglossary.py
@@ -24,9 +24,9 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Validate the use of \newglossary in TeX source files in conjunction
-with variant_dir. 
+with variant_dir.
 
 Test configuration contributed by Kendrick Boyd.
 """
@@ -104,6 +104,6 @@ files = [
 for f in files:
     test.must_exist(['build',f])
     test.must_not_exist(['src',f])
-    
+
 
 test.pass_test()
diff --git a/test/TEX/variant_dir_style_dup0.py b/test/TEX/variant_dir_style_dup0.py
index 711086f..a9649b0 100644
--- a/test/TEX/variant_dir_style_dup0.py
+++ b/test/TEX/variant_dir_style_dup0.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-"""
+r"""
 Test creation of a fully-featured TeX document (with bibliography
 and index) in a variant_dir.
 
@@ -117,13 +117,13 @@ r"""
 \makeindex
 
 \begin{document}
- 
+
 \title{Report Title}
 
 \author{A. N. Author}
- 
-\maketitle 
- 
+
+\maketitle
+
 \begin{abstract}
 there is no abstract
 \end{abstract}
@@ -139,7 +139,7 @@ The introduction is short.
 
 \section{Acknowledgements}
 
-The Acknowledgements are show as well \cite{AnAuthor:2006fk}.  
+The Acknowledgements are show as well \cite{AnAuthor:2006fk}.
 
 \index{Getting the Report}