diff options
| author | Mats Wichmann <mats@linux.com> | 2020-02-18 15:24:13 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2020-02-20 14:27:02 (GMT) |
| commit | 71389d9642877ffcb191b16f7b08ba3bf78da530 (patch) | |
| tree | 239c29d2ac66c5fc32640431329b11ae97c75832 /test/Interactive | |
| parent | 6975fa52a3424d995aadeabd31f57d491456a3e4 (diff) | |
| download | SCons-71389d9642877ffcb191b16f7b08ba3bf78da530.zip SCons-71389d9642877ffcb191b16f7b08ba3bf78da530.tar.gz SCons-71389d9642877ffcb191b16f7b08ba3bf78da530.tar.bz2 | |
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>
Diffstat (limited to 'test/Interactive')
| -rw-r--r-- | test/Interactive/shell.py | 6 | ||||
| -rw-r--r-- | test/Interactive/version.py | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/test/Interactive/shell.py b/test/Interactive/shell.py index dd13504..e839d6d 100644 --- a/test/Interactive/shell.py +++ b/test/Interactive/shell.py @@ -20,14 +20,14 @@ # 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__" """ Verify the ability of the "shell" command (and its "sh" and "!" aliases) to shell out of interactive mode. """ +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + import sys import TestSCons @@ -40,8 +40,6 @@ shell_command_py = test.workpath('shell_command.py') _shell_command_py_ = '"%s"' % shell_command_py.replace('\\', '\\\\') test.write(shell_command_py, """\ -from __future__ import print_function - print('hello from shell_command.py') """) diff --git a/test/Interactive/version.py b/test/Interactive/version.py index 88416ad..6609ad7 100644 --- a/test/Interactive/version.py +++ b/test/Interactive/version.py @@ -20,14 +20,13 @@ # 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. -# -from __future__ import print_function -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ Verify the behavior of the "version" subcommand. """ +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + import TestCmd import TestSCons |