diff -r 123804a72a8f Lib/test/test_trace.py --- a/Lib/test/test_trace.py Fri Nov 01 14:24:28 2013 -0700 +++ b/Lib/test/test_trace.py Sat Nov 02 12:34:54 2013 +0800 @@ -307,11 +307,11 @@ with captured_stdout() as stdout: self._coverage(tracer) stdout = stdout.getvalue() - self.assertTrue("pprint.py" in stdout) - self.assertTrue("case.py" in stdout) # from unittest + self.assertIn("pprint.py", stdout) + self.assertIn("case.py", stdout) # from unittest files = os.listdir(TESTFN) - self.assertTrue("pprint.cover" in files) - self.assertTrue("unittest.case.cover" in files) + self.assertIn("pprint.cover", files) + self.assertIn("unittest.case.cover", files) def test_coverage_ignore(self): # Ignore all files, nothing should be traced nor printed diff -r 123804a72a8f Modules/getpath.c --- a/Modules/getpath.c Fri Nov 01 14:24:28 2013 -0700 +++ b/Modules/getpath.c Sat Nov 02 12:34:54 2013 +0800 @@ -762,10 +762,8 @@ while (1) { wchar_t *delim = wcschr(defpath, DELIM); - if (defpath[0] != SEP) { + if (defpath[0] != SEP) wcscat(buf, prefix); - wcscat(buf, separator); - } if (delim) { size_t len = delim - defpath + 1;