Merge branch 'master' of https://github.com/fleming79/filesystem_spec

fsspec/implementations/local.py

@@ -291,14 +291,19 @@ def _make_path_posix(path, sep=os.sep):
     if path.startswith("\\\\"):
         # special case for windows UNC/DFS-style paths, do nothing,
         # just flip the slashes around (case below does not work!)
-        return path.replace("\\", "/")
+        path = path.replace("\\", "/")
     if re.match("[A-Za-z]:", path):
         # windows full path like "C:\\local\\path"
-        return path.lstrip("\\").replace("\\", "/").replace("//", "/")
+        path = path.lstrip("\\").replace("\\", "/").replace("//", "/")
     if path.startswith("\\"):
         # windows network path like "\\server\\path"
-        return "/" + path.lstrip("\\").replace("\\", "/").replace("//", "/")
-    return path
+        path = "/" + path.lstrip("\\").replace("\\", "/").replace("//", "/")
+    if os.name == "nt" and len(path) == 3 and path[1] == ":":
+        return path  # windows root
+    if remove_trailing_slash:
+        return path.rstrip("/")
+    else:
+        return path
 
 
 def trailing_sep(path):

fsspec/implementations/tests/test_local.py

@@ -630,7 +630,8 @@ def test_strip_protocol_expanduser():
     assert path != stripped
     assert "file://" not in stripped
     assert stripped.startswith(os.path.expanduser("~").replace("\\", "/"))
-    assert not LocalFileSystem._strip_protocol("./").endswith("/")
+    path = LocalFileSystem._strip_protocol("./", remove_trailing_slash=True)
+    assert not path.endswith("/")
 
 
 def test_strip_protocol_no_authority():