traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #19398: Extra slash no longer added to sys.path components in case of 

empty compile-time PYTHONPATH components.  This fixes some tests in -S or -I
modes.
This commit is contained in:
Serhiy Storchaka 2016-11-11 12:07:48 +02:00
parent 684cadaef9 a27c064428
commit ac40c6c575
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_trace.py
View File

@ -311,11 +311,11 @@ class TestCoverage(unittest.TestCase):
with captured_stdout() as stdout: with captured_stdout() as stdout:
self._coverage(tracer) self._coverage(tracer)
stdout = stdout.getvalue() stdout = stdout.getvalue()
self.assertTrue("pprint.py" in stdout) self.assertIn("pprint.py", stdout)
self.assertTrue("case.py" in stdout) # from unittest self.assertIn("case.py", stdout) # from unittest
files = os.listdir(TESTFN) files = os.listdir(TESTFN)
self.assertTrue("pprint.cover" in files) self.assertIn("pprint.cover", files)
self.assertTrue("unittest.case.cover" in files) self.assertIn("unittest.case.cover", files)
def test_coverage_ignore(self): def test_coverage_ignore(self):
# Ignore all files, nothing should be traced nor printed # Ignore all files, nothing should be traced nor printed

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ What's New in Python 3.7.0 alpha 1
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #19398: Extra slash no longer added to sys.path components in case of
empty compile-time PYTHONPATH components.
- Issue #28621: Sped up converting int to float by reusing faster bits counting - Issue #28621: Sped up converting int to float by reusing faster bits counting
implementation. Patch by Adrian Wielgosik. implementation. Patch by Adrian Wielgosik.

3
Modules/getpath.c
View File

@ -762,8 +762,11 @@ calculate_path(void)
if (defpath[0] != SEP) { if (defpath[0] != SEP) {
wcscat(buf, prefix); wcscat(buf, prefix);
if (prefixsz >= 2 && prefix[prefixsz - 2] != SEP &&
defpath[0] != (delim ? DELIM : L'\0')) { /* not empty */
wcscat(buf, separator); wcscat(buf, separator);
} }
}
if (delim) { if (delim) {
size_t len = delim - defpath + 1; size_t len = delim - defpath + 1;