Merge pull request #45 from martindurant/exists_not_owned

Exists not owned
fsspec · Dec 6, 2017 · 65c9ab7 · 65c9ab7
2 parents cfaf70f + 0f8c2e6
commit 65c9ab7
Show file tree

Hide file tree

Showing 2 changed files with 230 additions and 135 deletions.
diff --git a/gcsfs/core.py b/gcsfs/core.py
@@ -350,8 +350,11 @@ def _call(self, method, path, *args, **kwargs):
 
     def _list_buckets(self):
         if '' not in self.dirs:
-            out = self._call('get', 'b/', project=self.project)
-            dirs = out.get('items', [])
+            try:
+                out = self._call('get', 'b/', project=self.project)
+                dirs = out.get('items', [])
+            except (FileNotFoundError, IOError, ValueError):
+                dirs = []
             self.dirs[''] = dirs
         return self.dirs['']
 
@@ -399,7 +402,7 @@ def rmdir(self, bucket):
             for v in self.dirs[''][:]:
                 if v['name'] == bucket:
                     self.dirs[''].remove(v)
-        self.invalidate_cache(bucket)
+        self.dirs.pop(bucket, None)
 
     def invalidate_cache(self, bucket=None):
         """
@@ -501,7 +504,16 @@ def exists(self, path):
             if key:
                 return bool(self.info(path))
             else:
-                return bucket in self.ls('')
+                if bucket in self.ls(''):
+                    return True
+                else:
+                    try:
+                        self._list_bucket(bucket)
+                        return True
+                    except (FileNotFoundError, IOError, ValueError):
+                        # bucket listing failed as it doesn't exist or we can't
+                        # see it
+                        return False
         except FileNotFoundError:
             return False