From 7cdc2bdd0d13982256fb28f49696fa70baab7ed0 Mon Sep 17 00:00:00 2001 From: Hynek Schlawack Date: Tue, 17 Jul 2012 10:48:19 +0200 Subject: Fix context manager use in posixpath.join() tests The asserts were useless (and buggy). --- Lib/test/test_posixpath.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py index 54de0cf..1ec4a15 100644 --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -56,15 +56,18 @@ class PosixPathTest(unittest.TestCase): self.assertEqual(posixpath.join(b"/foo/", b"bar/", b"baz/"), b"/foo/bar/baz/") - with self.assertRaises(TypeError) as e: - posixpath.join(b'bytes', 'str') - self.assertIn("Can't mix strings and bytes", e.args[0]) - with self.assertRaises(TypeError) as e: - posixpath.join('str', b'bytes') - self.assertIn("Can't mix strings and bytes", e.args[0]) - with self.assertRaises(TypeError) as e: - posixpath.join('str', bytearray(b'bytes')) - self.assertIn("Can't mix strings and bytes", e.args[0]) + # Check for friendly str/bytes mixing message + for args in [[b'bytes', 'str'], + [bytearray(b'bytes'), 'str']]: + for _ in range(2): + with self.assertRaises(TypeError) as cm: + posixpath.join(*args) + self.assertEqual( + "Can't mix strings and bytes in path components.", + cm.exception.args[0] + ) + args.reverse() # check both orders + def test_split(self): self.assertEqual(posixpath.split("/foo/bar"), ("/foo", "bar")) -- cgit v0.12 From eb3e62f1c88e4a94be95e38e01541ebb52079d3a Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Tue, 17 Jul 2012 20:42:39 +1000 Subject: Issue #15230: Attempt to make the OS X buildbots happy by resolving the tmp dir symlink in the test suite --- Lib/test/test_runpy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py index 85eb76f..6e9c4fc 100644 --- a/Lib/test/test_runpy.py +++ b/Lib/test/test_runpy.py @@ -182,7 +182,7 @@ class RunModuleTestCase(unittest.TestCase, CodeExecutionMixin): def _make_pkg(self, source, depth, mod_base="runpy_test"): pkg_name = "__runpy_pkg__" test_fname = mod_base+os.extsep+"py" - pkg_dir = sub_dir = tempfile.mkdtemp() + pkg_dir = sub_dir = os.path.realpath(tempfile.mkdtemp()) if verbose > 1: print(" Package tree in:", sub_dir) sys.path.insert(0, pkg_dir) if verbose > 1: print(" Updated sys.path:", sys.path[0]) -- cgit v0.12 From c5a45669229906a2ff8ea87bd69d1df2feac8ffc Mon Sep 17 00:00:00 2001 From: Hynek Schlawack Date: Tue, 17 Jul 2012 13:05:43 +0200 Subject: #15377: Make posixpath.join() more strict when checking for str/bytes mix Based on a patch by Nick Coghlan. --- Lib/posixpath.py | 9 +++++---- Lib/test/test_posixpath.py | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Lib/posixpath.py b/Lib/posixpath.py index 84bcc13..7a4daa8b 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -83,11 +83,12 @@ def join(a, *p): else: path += sep + b except TypeError: - strs = [isinstance(s, str) for s in (a, ) + p] - if any(strs) and not all(strs): + valid_types = all(isinstance(s, (str, bytes, bytearray)) + for s in (a, ) + p) + if valid_types: + # Must have a mixture of text and binary data raise TypeError("Can't mix strings and bytes in path components.") - else: - raise + raise return path diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py index 1ec4a15..89c4f9e 100644 --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -1,6 +1,7 @@ import unittest from test import support, test_genericpath +import itertools import posixpath import os import sys @@ -56,18 +57,21 @@ class PosixPathTest(unittest.TestCase): self.assertEqual(posixpath.join(b"/foo/", b"bar/", b"baz/"), b"/foo/bar/baz/") - # Check for friendly str/bytes mixing message - for args in [[b'bytes', 'str'], - [bytearray(b'bytes'), 'str']]: - for _ in range(2): + def check_error_msg(list_of_args, msg): + """Check posixpath.join raises friendly TypeErrors.""" + for args in (item for perm in list_of_args + for item in itertools.permutations(perm)): with self.assertRaises(TypeError) as cm: posixpath.join(*args) - self.assertEqual( - "Can't mix strings and bytes in path components.", - cm.exception.args[0] - ) - args.reverse() # check both orders - + self.assertEqual(msg, cm.exception.args[0]) + + check_error_msg([[b'bytes', 'str'], [bytearray(b'bytes'), 'str']], + "Can't mix strings and bytes in path components.") + # regression, see #15377 + with self.assertRaises(TypeError) as cm: + os.path.join(None, 'str') + self.assertNotEqual("Can't mix strings and bytes in path components.", + cm.exception.args[0]) def test_split(self): self.assertEqual(posixpath.split("/foo/bar"), ("/foo", "bar")) -- cgit v0.12