Add test and other fixes

Author: Martin Durant

fsspec/core.py

@@ -400,7 +400,8 @@ def get_fs_token_paths(
         if "w" in mode:
             paths = _expand_paths(path, name_function, num)
         elif "*" in path:
-            paths = sorted(fs.glob(path))
+            paths = [f for f in sorted(fs.glob(path))
+                     if not fs.isdir(f)]
         else:
             paths = [path]
 

fsspec/implementations/http.py

@@ -107,7 +107,7 @@ def ls(self, url, detail=True):
             return list(sorted(out))
 
     def cat(self, url):
-        r = requests.get(url, **self.kwargs)
+        r = self.session.get(url, **self.kwargs)
         r.raise_for_status()
         return r.content
 

fsspec/implementations/tests/test_cached.py

@@ -24,7 +24,7 @@ def local_filecache():
         "filecache", target_protocol="file", cache_storage=cache_location
     )
 
-    return (data, original_file, cache_location, fs)
+    return data, original_file, cache_location, fs
 
 
 def test_idempotent():
@@ -59,6 +59,22 @@ def test_workflow(ftp_writable):
     assert fs.cat("/out") == b"test"  # old value
 
 
+def test_glob(ftp_writable):
+    host, port, user, pw = ftp_writable
+    fs = FTPFileSystem(host, port, user, pw)
+    with fs.open("/out", "wb") as f:
+        f.write(b"test")
+    with fs.open("/out2", "wb") as f:
+        f.write(b"test2")
+    fs = fsspec.filesystem(
+        "cached",
+        target_protocol="ftp",
+        target_options={"host": host, "port": port, "username": user, "password": pw},
+    )
+    assert fs.glob('/wrong*') == []
+    assert fs.glob('/ou*') == ['/out', '/out2']
+
+
 def test_blocksize(ftp_writable):
     host, port, user, pw = ftp_writable
     fs = FTPFileSystem(host, port, user, pw)

fsspec/registry.py

@@ -69,6 +69,10 @@
         "class": "fsspec.implementations.dask.DaskWorkerFileSystem",
         "err": "Install dask distributed to access worker file system",
     },
+    "github": {
+        "class": "fsspec.implementations.github.GithubFileSystem",
+        "err": "Install the requests to use the github FS"
+    }
 }
 
 minversions = {"s3fs": LooseVersion("0.3.0"), "gcsfs": LooseVersion("0.3.0")}

fsspec/transaction.py

@@ -27,6 +27,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 
     def start(self):
         """Start a transaction on this FileSystem"""
+        self.files = []  # clean up after previous failed completions
         self.fs._intrans = True
 
     def complete(self, commit=True):