Merge 116c5d6 into ee3e335

.gitignore

@@ -94,3 +94,4 @@ ENV/
 #PyCharm
 
 .idea/
+/tmp/

fs/_fscompat.py

@@ -5,40 +5,8 @@
 try:
     from os import fsencode, fsdecode
 except ImportError:
-    def _fscodec():
-        encoding = sys.getfilesystemencoding()
-        errors = 'strict' if encoding == 'mbcs' else 'surrogateescape'
+    from backports.os import fsencode, fsdecode
 
-        def fsencode(filename):
-            """
-            Encode filename to the filesystem encoding with 'surrogateescape' error
-            handler, return bytes unchanged. On Windows, use 'strict' error handler if
-            the file system encoding is 'mbcs' (which is the default encoding).
-            """
-            if isinstance(filename, bytes):
-                return filename
-            elif isinstance(filename, six.text_type):
-                return filename.encode(encoding, errors)
-            else:
-                raise TypeError("expect string type, not %s" % type(filename).__name__)
-
-        def fsdecode(filename):
-            """
-            Decode filename from the filesystem encoding with 'surrogateescape' error
-            handler, return str unchanged. On Windows, use 'strict' error handler if
-            the file system encoding is 'mbcs' (which is the default encoding).
-            """
-            if isinstance(filename, six.text_type):
-                return filename
-            elif isinstance(filename, bytes):
-                return filename.decode(encoding, errors)
-            else:
-                raise TypeError("expect string type, not %s" % type(filename).__name__)
-
-        return fsencode, fsdecode
-
-    fsencode, fsdecode = _fscodec()
-    del _fscodec
 
 try:
     from os import fspath

fs/base.py

@@ -599,14 +599,16 @@ def getsize(self, path):
         size = self.getdetails(path).size
         return size
 
-    def getsyspath(self, path):
+    def getsyspath(self, path, as_bytes=False):
         """Get the *system path* of a resource.
 
         Parameters:
             path (str): A path on the filesystem.
+            as_bytes (bool, optional): If `True`, return the path as bytes using
+                the native filesystem encoding. (defaults to `False`).
 
         Returns:
-            str: the *system path* of the resource, if any.
+            str: the *system path* of the resource, if any, always as Unicode.
 
         Raises:
             fs.errors.NoSysPath: If there is no corresponding system path.