summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2019-03-18 15:19:04 (GMT)
committerMats Wichmann <mats@linux.com>2019-03-30 13:24:51 (GMT)
commit573636d6e3583bed65bb864471161307c57d3b0c (patch)
tree11eaf09462962fd3d48225f971f15703a057a16b
parenta1a76026505d444ad04fd3494badcdacf8e58857 (diff)
downloadSCons-573636d6e3583bed65bb864471161307c57d3b0c.zip
SCons-573636d6e3583bed65bb864471161307c57d3b0c.tar.gz
SCons-573636d6e3583bed65bb864471161307c57d3b0c.tar.bz2
[PY 3.8] fix some sider complaints in #3331
One was "real": had failed to indent a with: block Signed-off-by: Mats Wichmann <mats@linux.com>
-rw-r--r--bin/SConsDoc.py1
-rw-r--r--src/engine/SCons/Tool/__init__.py1
-rw-r--r--testing/framework/TestCmdTests.py2
3 files changed, 2 insertions, 2 deletions
diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py
index 0c78525..bd9c90d 100644
--- a/bin/SConsDoc.py
+++ b/bin/SConsDoc.py
@@ -826,6 +826,7 @@ else: # PY3 version, from newer pydoc
def importfile(path):
"""Import a Python source file or compiled file given its path."""
import importlib
+ from pydoc import ErrorDuringImport
magic = importlib.util.MAGIC_NUMBER
with open(path, 'rb') as file:
is_bytecode = magic == file.read(len(magic))
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index ae65d53..8fbd587 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -41,7 +41,6 @@ import sys
import re
import os
import shutil
-import importlib
import SCons.Builder
import SCons.Errors
diff --git a/testing/framework/TestCmdTests.py b/testing/framework/TestCmdTests.py
index bb9e3f9..29be9aa 100644
--- a/testing/framework/TestCmdTests.py
+++ b/testing/framework/TestCmdTests.py
@@ -3332,7 +3332,7 @@ class write_TestCase(TestCmdTestCase):
with open(test.workpath('file8'), 'r') as f:
assert f.read() == "Test file #8.\n"
with open(test.workpath('file9'), 'rb') as f:
- assert f.read() == "Test file #9.\r\n"
+ assert f.read() == "Test file #9.\r\n"
class variables_TestCase(TestCmdTestCase):