diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-09-17 19:57:03 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-09-17 19:57:03 (GMT) |
| commit | 64566db065f795614f245b0cb81358b74fb9f472 (patch) | |
| tree | ef69bbb20ca773376ee01c7c3578effa13392af3 /Lib/test | |
| parent | c1c4a64edb1956befb757f8704e6b4f32e4a575e (diff) | |
| parent | ed51b268580c1100b46bf5dbc4b4201146019644 (diff) | |
| download | cpython-64566db065f795614f245b0cb81358b74fb9f472.zip cpython-64566db065f795614f245b0cb81358b74fb9f472.tar.gz cpython-64566db065f795614f245b0cb81358b74fb9f472.tar.bz2 | |
Merge with 3.6
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_site.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 9afa56e..b048648 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -140,8 +140,6 @@ class HelperFunctionsTests(unittest.TestCase): self.assertRegex(err_out.getvalue(), 'Traceback') self.assertRegex(err_out.getvalue(), 'ModuleNotFoundError') - @unittest.skipIf(sys.platform == "win32", "Windows does not raise an " - "error for file paths containing null characters") def test_addpackage_import_bad_pth_file(self): # Issue 5258 pth_dir, pth_fn = self.make_pth("abc\x00def\n") @@ -447,10 +445,9 @@ class StartupImportTests(unittest.TestCase): popen = subprocess.Popen([sys.executable, '-I', '-v', '-c', 'import sys; print(set(sys.modules))'], stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + stderr=subprocess.PIPE, + encoding='utf-8') stdout, stderr = popen.communicate() - stdout = stdout.decode('utf-8') - stderr = stderr.decode('utf-8') modules = eval(stdout) self.assertIn('site', modules) @@ -474,6 +471,5 @@ class StartupImportTests(unittest.TestCase): if sys.platform != 'darwin': self.assertFalse(modules.intersection(collection_mods), stderr) - if __name__ == "__main__": unittest.main() |