more trim

Author: martindurant

fsspec/__init__.py

@@ -2,7 +2,6 @@
 from ._version import __version__  # noqa: F401
 from .core import get_fs_token_paths, open, open_files, open_local, url_to_fs
 from .exceptions import FSTimeoutError
-from .mapping import FSMap, get_mapper
 from .registry import (
     available_protocols,
     filesystem,
@@ -15,12 +14,10 @@
 __all__ = [
     "AbstractFileSystem",
     "FSTimeoutError",
-    "FSMap",
     "filesystem",
     "register_implementation",
     "get_filesystem_class",
     "get_fs_token_paths",
-    "get_mapper",
     "open",
     "open_files",
     "open_local",
@@ -29,39 +26,3 @@
     "available_protocols",
     "url_to_fs",
 ]
-
-
-def process_entries():
-    try:
-        from importlib.metadata import entry_points
-    except ImportError:
-        return
-    if entry_points is not None:
-        try:
-            eps = entry_points()
-        except TypeError:
-            pass  # importlib-metadata < 0.8
-        else:
-            if hasattr(eps, "select"):  # Python 3.10+ / importlib_metadata >= 3.9.0
-                specs = eps.select(group="fsspec.specs")
-            else:
-                specs = eps.get("fsspec.specs", [])
-            registered_names = {}
-            for spec in specs:
-                err_msg = f"Unable to load filesystem from {spec}"
-                name = spec.name
-                if name in registered_names:
-                    continue
-                registered_names[name] = True
-                register_implementation(
-                    name,
-                    spec.value.replace(":", "."),
-                    errtxt=err_msg,
-                    # We take our implementations as the ones to overload with if
-                    # for some reason we encounter some, may be the same, already
-                    # registered
-                    clobber=True,
-                )
-
-
-process_entries()

fsspec/config.py

@@ -9,7 +9,6 @@
     ReadAheadCache,
     caches,
 )
-from fsspec.config import conf
 from fsspec.registry import filesystem, get_filesystem_class
 from fsspec.utils import (
     _unstrip_protocol,
@@ -310,8 +309,6 @@ def open_files(
 
 def _un_chain(path, kwargs):
     # Avoid a circular import
-    from fsspec.implementations.cached import CachingFileSystem
-
     if "::" in path:
         x = re.compile(".*[^a-z]+.*")  # test for non protocol-like single word
         bits = []
@@ -324,7 +321,6 @@ def _un_chain(path, kwargs):
         bits = [path]
     # [[url, protocol, kwargs], ...]
     out = []
-    previous_bit = None
     kwargs = kwargs.copy()
     for bit in reversed(bits):
         protocol = kwargs.pop("protocol", None) or split_protocol(bit)[0] or "file"
@@ -338,10 +334,7 @@ def _un_chain(path, kwargs):
             **kws,
         )
         bit = cls._strip_protocol(bit)
-        if "target_protocol" not in kw and issubclass(cls, CachingFileSystem):
-            bit = previous_bit
         out.append((bit, protocol, kw))
-        previous_bit = bit
     out.reverse()
     return out
 
@@ -396,7 +389,7 @@ def url_to_fs(url, **kwargs):
     return fs, urlpath
 
 
-DEFAULT_EXPAND = conf.get("open_expand", False)
+DEFAULT_EXPAND = False
 
 
 def open(