diff options
| -rw-r--r-- | bin/SConsDoc.py | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 1 | ||||
| -rw-r--r-- | testing/framework/TestCmdTests.py | 2 |
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): |