summaryrefslogtreecommitdiffstats
path: root/test/sconsign
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2019-06-25 16:56:43 (GMT)
committerMats Wichmann <mats@linux.com>2019-12-05 00:33:25 (GMT)
commitd4eaa1986cfffdb11eee0aa5240fa44bef370fb1 (patch)
treefe156e17caec56884bff27bf350ee3f38950d5cc /test/sconsign
parent714d2c0baf5573c32bf709f3d252496c2359b345 (diff)
downloadSCons-d4eaa1986cfffdb11eee0aa5240fa44bef370fb1.zip
SCons-d4eaa1986cfffdb11eee0aa5240fa44bef370fb1.tar.gz
SCons-d4eaa1986cfffdb11eee0aa5240fa44bef370fb1.tar.bz2
Improve building of docs using Py3 [ci skip]
* context managers on file r/w + use shutil.copy where it makes sense. * lxml wants (demands?) that xml files be processed as bytes * for the phase where we gen the entity files, read as text anyway * Need to solve a problem where the generated xml is putting the \n in literally, not evaluating it. * Fix some examples broken for py3 * Fix more octal constant instances * Cleanups suggested by PyCharm: staticmethods, two blanks before class definition, others. This addresses issues called out in #3300, but is not a complete solution because the actual doc build step still fails with the epydoc failures (which aren't directly because of Py3; epydoc build doesn't work any better on my system with Py3, even with the forked version with patches). Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/sconsign')
-rw-r--r--test/sconsign/script/Signatures.py2
-rw-r--r--test/sconsign/script/no-SConsignFile.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/sconsign/script/Signatures.py b/test/sconsign/script/Signatures.py
index 34737d5..9583cc6 100644
--- a/test/sconsign/script/Signatures.py
+++ b/test/sconsign/script/Signatures.py
@@ -48,7 +48,7 @@ test.subdir('sub1', 'sub2')
# Because this test sets SConsignFile(None), we execute our fake
# scripts directly, not by feeding them to the Python executable.
-# That is, we chmod 0755 and us a "#!/usr/bin/env python" first
+# That is, we chmod 0o755 and use a "#!/usr/bin/env python" first
# line for POSIX systems, and add .PY to the %PATHEXT% variable on
# Windows. If we didn't do this, then running this script with
# suitable prileveges would create a .sconsign file in the directory
diff --git a/test/sconsign/script/no-SConsignFile.py b/test/sconsign/script/no-SConsignFile.py
index cf5bcb2..3702c6c 100644
--- a/test/sconsign/script/no-SConsignFile.py
+++ b/test/sconsign/script/no-SConsignFile.py
@@ -40,7 +40,7 @@ test.subdir('sub1', 'sub2')
# Because this test sets SConsignFile(None), we execute our fake
# scripts directly, not by feeding them to the Python executable.
-# That is, we chmod 0755 and us a "#!/usr/bin/env python" first
+# That is, we chmod 0o755 and use a "#!/usr/bin/env python" first
# line for POSIX systems, and add .PY to the %PATHEXT% variable on
# Windows. If we didn't do this, then running this script with
# suitable prileveges would create a .sconsign file in the directory