From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 4 Oct 2014 13:09:02 +0000 (+0300)
Subject: Fixed tests on Windows for issue #21883.
X-Git-Tag: v3.5.0a1~762
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4f47088af0040d73449d0cb0fe1e6d863f3ad07;p=python

Fixed tests on Windows for issue #21883.
---

diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 8f5dc55bec..ee1a2157a1 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 ce5f7928cc..44ed8383f2 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 2e31fe4236..f2722bcc8a 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')