summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-10-04 13:09:02 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-10-04 13:09:02 (GMT)
commite4f47088af0040d73449d0cb0fe1e6d863f3ad07 (patch)
tree4aa9b1ffb19294202e1e5f75dcaf88c7bc91045c
parentd32abc12e8764f39c562de31dbe6196a94f4c3bd (diff)
downloadcpython-e4f47088af0040d73449d0cb0fe1e6d863f3ad07.zip
cpython-e4f47088af0040d73449d0cb0fe1e6d863f3ad07.tar.gz
cpython-e4f47088af0040d73449d0cb0fe1e6d863f3ad07.tar.bz2
Fixed tests on Windows for issue #21883.
-rw-r--r--Lib/ntpath.py2
-rw-r--r--Lib/posixpath.py2
-rw-r--r--Lib/test/test_genericpath.py3
3 files changed, 4 insertions, 3 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 8f5dc55..ee1a215 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -584,7 +584,7 @@ def relpath(path, start=None):
if not rel_list:
return curdir
return join(*rel_list)
- except (TypeError, ValueError, AttributeError, BytesWarning):
+ except (TypeError, ValueError, AttributeError, BytesWarning, DeprecationWarning):
genericpath._check_arg_types('relpath', path, start)
raise
diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index ce5f792..44ed838 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -452,6 +452,6 @@ def relpath(path, start=None):
if not rel_list:
return curdir
return join(*rel_list)
- except (TypeError, AttributeError, BytesWarning):
+ except (TypeError, AttributeError, BytesWarning, DeprecationWarning):
genericpath._check_arg_types('relpath', path, start)
raise
diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
index 2e31fe4..f2722bc 100644
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -453,7 +453,8 @@ class CommonTest(GenericTest):
def test_relpath_errors(self):
# Check relpath() raises friendly TypeErrors.
- with support.check_warnings(('', BytesWarning), quiet=True):
+ with support.check_warnings(('', (BytesWarning, DeprecationWarning)),
+ quiet=True):
errmsg = "Can't mix strings and bytes in path components"
with self.assertRaisesRegex(TypeError, errmsg):
self.pathmodule.relpath(b'bytes', 'str')