Skip to content

Commit

Permalink
Merge pull request #46 from 4Catalyzer/up
Browse files Browse the repository at this point in the history
Fix Python 3.7 compatibility
  • Loading branch information
taion authored Aug 17, 2018
2 parents af2d27e + 54673af commit 203f9d9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ matrix:
env: TOXENV=py-base
- python: "3.6"
env: TOXENV=py-base
- # TODO: Remove this workaround once travis-ci/travis-ci#9815 is fixed.
sudo: true
dist: xenial
python: "3.7"
env: TOXENV=py-s3

cache:
directories:
Expand Down
2 changes: 1 addition & 1 deletion flask_annex/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ def recursive_glob(root_dir, pattern='*'):
return tuple(
os.path.join(root, filename)
for root, _dirnames, filenames in os.walk(root_dir)
for filename in fnmatch.filter(filenames, pattern),
for filename in fnmatch.filter(filenames, pattern)
)
2 changes: 1 addition & 1 deletion flask_annex/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def list_keys(self, prefix):

return tuple(
os.path.relpath(filename, self._root_path)
for filename in filenames,
for filename in filenames
)

def save_file(self, key, in_file):
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{27,35,36}-{base,s3}
envlist = py{27,35,36,37}-{base,s3}

[testenv]
usedevelop = True
Expand Down

0 comments on commit 203f9d9

Please sign in to comment.