Merge pull request fsspec#662 from martindurant/after_release

Feedback after release

Author: martindurant

fsspec/implementations/local.py

@@ -58,17 +58,7 @@ def glob(self, path, **kwargs):
         return super().glob(path, **kwargs)
 
     def info(self, path, **kwargs):
-        if isinstance(path, str):
-            path = self._strip_protocol(path)
-            out = os.stat(path, follow_symlinks=False)
-            link = os.path.islink(path)
-            if os.path.isdir(path):
-                t = "directory"
-            elif os.path.isfile(path):
-                t = "file"
-            else:
-                t = "other"
-        else:
+        if hasattr(path, "stat"):
             # scandir DirEntry
             out = path.stat(follow_symlinks=False)
             link = path.is_symlink()
@@ -79,6 +69,17 @@ def info(self, path, **kwargs):
             else:
                 t = "other"
             path = self._strip_protocol(path.path)
+        else:
+            # str or path-like
+            path = self._strip_protocol(path)
+            out = os.stat(path, follow_symlinks=False)
+            link = os.path.islink(path)
+            if os.path.isdir(path):
+                t = "directory"
+            elif os.path.isfile(path):
+                t = "file"
+            else:
+                t = "other"
         result = {
             "name": path,
             "size": out.st_size,
@@ -123,6 +124,9 @@ def mv_file(self, path1, path2, **kwargs):
     def rm(self, path, recursive=False, maxdepth=None):
         path = self._strip_protocol(path).rstrip("/")
         if recursive and self.isdir(path):
+
+            if os.path.abspath(path) == os.getcwd():
+                raise ValueError("Cannot delete current working directory")
             shutil.rmtree(path)
         else:
             os.remove(path)
@@ -163,7 +167,7 @@ def _strip_protocol(cls, path):
         path = stringify_path(path)
         if path.startswith("file://"):
             path = path[7:]
-        return make_path_posix(path)
+        return make_path_posix(path).rstrip("/")
 
     def _isfilestore(self):
         # Inheriting from DaskFileSystem makes this False (S3, etc. were)

fsspec/implementations/tests/test_local.py

@@ -567,6 +567,7 @@ 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("/")
 
 
 def test_iterable(tmpdir):
@@ -665,6 +666,17 @@ def test_transaction(tmpdir):
     assert content == read_content
 
 
+def test_delete_cwd(tmpdir):
+    cwd = os.getcwd()
+    fs = LocalFileSystem()
+    try:
+        os.chdir(tmpdir)
+        with pytest.raises(ValueError):
+            fs.rm(".", recursive=True)
+    finally:
+        os.chdir(cwd)
+
+
 @pytest.mark.parametrize(
     "opener, ext", [(bz2.open, ".bz2"), (gzip.open, ".gz"), (open, "")]
 )

fsspec/registry.py

@@ -1,5 +1,4 @@
 import importlib
-from distutils.version import LooseVersion
 
 __all__ = ["registry", "get_filesystem_class", "default"]
 
@@ -187,8 +186,6 @@ def register_implementation(name, cls, clobber=True, errtxt=None):
     "reference": {"class": "fsspec.implementations.reference.ReferenceFileSystem"},
 }
 
-minversions = {"s3fs": LooseVersion("0.3.0"), "gcsfs": LooseVersion("0.3.0")}
-
 
 def get_filesystem_class(protocol):
     """Fetch named protocol implementation from the registry
@@ -221,19 +218,20 @@ def get_filesystem_class(protocol):
 
 
 def _import_class(cls, minv=None):
-    mod, name = cls.rsplit(".", 1)
-    minv = minv or minversions
-    minversion = minv.get(mod, None)
-
-    mod = importlib.import_module(mod)
-    if minversion:
-        version = getattr(mod, "__version__", None)
-        if version and LooseVersion(version) < minversion:
-            raise RuntimeError(
-                "'{}={}' is installed, but version '{}' or "
-                "higher is required".format(mod.__name__, version, minversion)
-            )
-    return getattr(mod, name)
+    """Take a string FQP and return the imported class or identifier
+
+    clas is of the form "package.module.klass" or "package.module:subobject.klass"
+    """
+    if ":" in cls:
+        mod, name = cls.rsplit(":", 1)
+        mod = importlib.import_module(mod)
+        for part in name.split("."):
+            mod = getattr(mod, part)
+        return mod
+    else:
+        mod, name = cls.rsplit(".", 1)
+        mod = importlib.import_module(mod)
+        return getattr(mod, name)
 
 
 def filesystem(protocol, **storage_options):

fsspec/tests/test_registry.py

@@ -38,22 +38,6 @@ def clean_imports():
         sys.modules["fsspec"] = real_module
 
 
-@pytest.mark.parametrize(
-    "protocol,module,minversion,oldversion",
-    [("s3", "s3fs", "0.3.0", "0.1.0"), ("gs", "gcsfs", "0.3.0", "0.1.0")],
-)
-def test_minversion_s3fs(protocol, module, minversion, oldversion, monkeypatch):
-    _registry.clear()
-    mod = pytest.importorskip(module, minversion)
-
-    assert get_filesystem_class("s3") is not None
-    _registry.clear()
-
-    monkeypatch.setattr(mod, "__version__", oldversion)
-    with pytest.raises(RuntimeError, match=minversion):
-        get_filesystem_class(protocol)
-
-
 def test_registry_readonly():
     get_filesystem_class("file")
     assert "file" in registry