[Python-checkins] cpython (merge 3.4 -> default): Issue #22034: Improve handling of wrong argument types in posixpath.join().
serhiy.storchaka
python-checkins at python.org
Sun Aug 24 11:24:44 CEST 2014
http://hg.python.org/cpython/rev/db600c927b2b
changeset: 92225:db600c927b2b
parent: 92223:014060738f7f
parent: 92224:d9607a71456e
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Aug 24 12:23:36 2014 +0300
summary:
Issue #22034: Improve handling of wrong argument types in posixpath.join().
files:
Lib/posixpath.py | 15 +++++++--------
Lib/test/test_posixpath.py | 26 +++++++++++++-------------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/Lib/posixpath.py b/Lib/posixpath.py
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -82,14 +82,13 @@
path += b
else:
path += sep + b
- except TypeError:
- 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.") from None
- raise
+ except (TypeError, AttributeError):
+ for s in (a,) + p:
+ if not isinstance(s, (str, bytes)):
+ raise TypeError('join() argument must be str or bytes, not %r' %
+ s.__class__.__name__) from None
+ # Must have a mixture of text and binary data
+ raise TypeError("Can't mix strings and bytes in path components") from None
return path
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -57,21 +57,21 @@
self.assertEqual(posixpath.join(b"/foo/", b"bar/", b"baz/"),
b"/foo/bar/baz/")
- 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(msg, cm.exception.args[0])
-
- check_error_msg([[b'bytes', 'str'], [bytearray(b'bytes'), 'str']],
- "Can't mix strings and bytes in path components.")
+ def test_join_errors(self):
+ # Check posixpath.join raises friendly TypeErrors.
+ errmsg = "Can't mix strings and bytes in path components"
+ with self.assertRaisesRegex(TypeError, errmsg):
+ posixpath.join(b'bytes', 'str')
+ with self.assertRaisesRegex(TypeError, errmsg):
+ posixpath.join('str', b'bytes')
# regression, see #15377
- with self.assertRaises(TypeError) as cm:
+ errmsg = r'join\(\) argument must be str or bytes, not %r'
+ with self.assertRaisesRegex(TypeError, errmsg % 'NoneType'):
posixpath.join(None, 'str')
- self.assertNotEqual("Can't mix strings and bytes in path components.",
- cm.exception.args[0])
+ with self.assertRaisesRegex(TypeError, errmsg % 'NoneType'):
+ posixpath.join('str', None)
+ with self.assertRaisesRegex(TypeError, errmsg % 'bytearray'):
+ posixpath.join(bytearray(b'foo'), bytearray(b'bar'))
def test_split(self):
self.assertEqual(posixpath.split("/foo/bar"), ("/foo", "bar"))
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list