diff options
author | Javier Jardón <jjardon@gnome.org> | 2016-12-09 16:08:58 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2016-12-09 16:08:58 +0000 |
commit | e7a26b615d3bc8565b812a0ebcaae0869e5fead6 (patch) | |
tree | aeb586c35be806edce60de368aa8d708743168b2 | |
parent | 01dc285d7e60633dade4cdf5fd5f3b97d5844c63 (diff) | |
parent | cbe56fdd527c585ef55541e16f1a847570b8623e (diff) | |
download | ybd-e7a26b615d3bc8565b812a0ebcaae0869e5fead6.tar.gz |
Merge branch 'lc/upgrade_fs' into 'master'
Upgrade pyfilesystem to 2.0.0
See merge request !283
-rw-r--r-- | requirements.freeze.txt | 2 | ||||
-rw-r--r-- | ybd/utils.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/requirements.freeze.txt b/requirements.freeze.txt index e3956ac..6cd7cd7 100644 --- a/requirements.freeze.txt +++ b/requirements.freeze.txt @@ -6,4 +6,4 @@ jsonschema==2.5.1 bottle==0.12.1 cherrypy==8.1.2 riemann-client==6.3.0 -fs==0.5.0 +fs==2.0.0 diff --git a/ybd/utils.py b/ybd/utils.py index 13a61c8..7a76dc7 100644 --- a/ybd/utils.py +++ b/ybd/utils.py @@ -372,11 +372,11 @@ def _find_extensions(paths): extension_kinds = ['check', 'configure', 'write'] efs = MultiFS() - map(lambda x: efs.addfs(x, OSFS(x)), paths) + map(lambda x: efs.add_fs(x, OSFS(x)), paths) def get_extensions(kind): return {os.path.splitext(x)[0]: efs.getsyspath(x) - for x in efs.walkfiles('.', '*.%s' % kind)} + for x in efs.walk.files(filter=['*.%s' % kind])} return {e: get_extensions(e) for e in extension_kinds} |