Fixed tests on Windows for issue #21883.

serhiy-storchaka · serhiy-storchaka · commit e4f47088af00 · 2014-10-04T16:09:02.000+03:00
diff --git 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
@@ -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
@@ -453,7 +453,8 @@ def test_join_errors(self):
 
     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')
