Loosen tests for OSError types.

Author: barneygale

Lib/pathlib/_abc.py

@@ -881,18 +881,15 @@ def move(self, target):
         if not isinstance(target, PathBase):
             target = self.with_segments(target)
         if self.is_dir(follow_symlinks=False):
-            delete_target = target.rmdir
+            try:
+                target.rmdir()
+            except FileNotFoundError:
+                pass
             copy_self = self.copytree
             delete_self = self.rmtree
         else:
-            delete_target = target.unlink
             copy_self = self.copy
             delete_self = self.unlink
-        try:
-            # Ensure we get an appropriate OSError if the target exists.
-            delete_target()
-        except FileNotFoundError:
-            pass
         copy_self(target, follow_symlinks=False, preserve_metadata=True)
         delete_self()
         return target

Lib/test/test_pathlib/test_pathlib_abc.py

@@ -2008,22 +2008,14 @@ def test_move_file_to_dir(self):
         base = self.cls(self.base)
         source = base / 'fileA'
         target = base / 'dirB'
-        if self.cls.parser is posixpath:
-            exc_type = IsADirectoryError
-        else:
-            exc_type = PermissionError
-        self.assertRaises(exc_type, source.move, target)
+        self.assertRaises(OSError, source.move, target)
 
     def test_move_file_to_empty_dir(self):
         base = self.cls(self.base)
         source = base / 'fileA'
         target = base / 'fileA_moved'
         target.mkdir()
-        if self.cls.parser is posixpath:
-            exc_type = IsADirectoryError
-        else:
-            exc_type = PermissionError
-        self.assertRaises(exc_type, source.move, target)
+        self.assertRaises(OSError, source.move, target)
 
     def test_move_dir(self):
         base = self.cls(self.base)
@@ -2045,22 +2037,13 @@ def test_move_dir_to_file(self):
         base = self.cls(self.base)
         source = base / 'dirB'
         target = base / 'fileA'
-        if self.cls.parser is posixpath:
-            exc_type = NotADirectoryError
-        else:
-            exc_type = PermissionError
-        self.assertRaises(exc_type, source.move, target)
+        self.assertRaises(OSError, source.move, target)
 
     def test_move_dir_to_dir(self):
         base = self.cls(self.base)
         source = base / 'dirC'
         target = base / 'dirB'
-        with self.assertRaises(OSError) as cm:
-            source.move(target)
-        if self.cls.parser is posixpath:
-            self.assertEqual(cm.exception.errno, errno.ENOTEMPTY)
-        else:
-            self.assertEqual(cm.exception.winerror, 5)  # ERROR_ACCESS_DENIED
+        self.assertRaises(OSError, source.move, target)
 
     def test_move_dir_to_empty_dir(self):
         base = self.cls(self.base)