Skip to content

Commit 918a2b8

Browse files
Merge branch 'master' into exists-fix
2 parents 64c31c1 + 3bc0375 commit 918a2b8

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ install:
2222
- export BOTO_CONFIG=/dev/null
2323
- export AWS_ACCESS_KEY_ID=foobar_key
2424
- export AWS_SECRET_ACCESS_KEY=foobar_secret
25-
- conda install moto "pytest<5" -c conda-forge -y
25+
- conda install boto=2.49.0 moto>=1.3.12 pytest -c conda-forge -y
2626
- pip install git+https://github.com/intake/filesystem_spec/ --no-deps
2727

2828
script:

docs/source/index.rst

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ emulates the standard ``File`` protocol (``read``, ``write``, ``tell``,
1717
``seek``), such that functions expecting a file can access S3. Only binary read
1818
and write modes are implemented, with blocked caching.
1919

20-
This project was originally designed as a storage-layer interface
21-
for `dask.distributed`_ and has a very similar interface to `hdfs3`_
20+
This uses and is based upon `fsspec`_
2221

23-
.. _`dask.distributed`: https://distributed.readthedocs.io/en/latest
24-
.. _`hdfs3`: http://hdfs3.readthedocs.io/en/latest/
22+
.. _fsspec: https://filesystem-spec.readthedocs.io/en/latest/
2523

2624
Examples
2725
--------
@@ -77,7 +75,7 @@ The following are known current omissions:
7775
- file access is always binary (although readline and iterating by line are
7876
possible)
7977

80-
- no permissions/access-control (i.e., no chmod/chmown methods)
78+
- no permissions/access-control (i.e., no chmod/chown methods)
8179

8280

8381
Credentials

s3fs/core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -854,10 +854,10 @@ def invalidate_cache(self, path=None):
854854
self.dircache.pop(path, None)
855855
self.dircache.pop(self._parent(path), None)
856856

857-
def walk(self, path, maxdepth=None):
857+
def walk(self, path, maxdepth=None, **kwargs):
858858
if path in ['', '*', 's3://']:
859859
raise ValueError('Cannot crawl all of S3')
860-
return super().walk(path, maxdepth=maxdepth)
860+
return super().walk(path, maxdepth=maxdepth, **kwargs)
861861

862862

863863
class S3File(AbstractBufferedFile):

0 commit comments

Comments
 (0)