Use surrogate handling identical to recent python's os.fsencode

1 files changed, 7 insertions, 1 deletions

diff --git a/xattr/lib.py b/xattr/lib.py
index 0f29190..6b098ff 100644
--- a/xattr/lib.py
+++ b/xattr/lib.py
@@ -608,8 +608,14 @@ XATTR_RESOURCEFORK_NAME = "com.apple.ResourceFork"
 
 
 def fs_encode(val):
+    encoding = sys.getfilesystemencoding()
+    if encoding == 'mbcs':
+        errors = 'strict'
+    else:
+        errors = 'surrogateescape'
+
     if not isinstance(val, bytes):
-        return val.encode(sys.getfilesystemencoding())
+        return val.encode(encoding, errors)
     else:
         return val