Fix ResourceLocked translation on Windows #484

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Fixed performance bugs in `fs.copy.copy_dir_if_newer`. Test cases were adapted to catch those bugs in the future.
 - Fixed precision bug for timestamps in `fs.OSFS.setinfo`.
+- Fixed `ResourceLocked` error translation on Windows [#484](https://github.com/PyFilesystem/pyfilesystem2/issues/484).
 
 
 ## [2.4.13] - 2021-03-27

fs/error_tools.py

@@ -84,7 +84,9 @@ def __exit__(
             _errno = exc_value.errno
             fserror = os_errors.get(_errno, errors.OperationFailed)
             if _errno == errno.EACCES and sys.platform == "win32":
-                if getattr(exc_value, "args", None) == 32:  # pragma: no cover
+                windows_error = getattr(exc_value, "winerror", 0)
+                exception_args = getattr(exc_value, "args", None) or (0,)
+                if windows_error == 32 or exception_args[0] == errno.EACCES:  # pragma: no cover
                     fserror = errors.ResourceLocked
             reraise(fserror, fserror(self._path, exc=exc_value), traceback)
 

tests/test_error_tools.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 import errno
+import sys
 import unittest
 
 import fs.errors
@@ -23,3 +24,13 @@ def test_convert_enametoolong(self):
                 raise exception
         self.assertEqual(ctx.exception.exc, exception)
         self.assertEqual(ctx.exception.path, "/tmp/test")
+
+    @unittest.skipIf(sys.platform != "win32", "requires Windows")
+    def test_convert_resourcelocked_windows(self):
+        exception = OSError(32, "resource locked")
+        with self.assertRaises(fs.errors.ResourceLocked) as ctx:
+            with convert_os_errors("stat", "/tmp/test"):
+                raise exception
+
+        self.assertEqual(ctx.exception.exc, exception)
+        self.assertEqual(ctx.exception.path, "/tmp/test")