'
else:
@@ -103,11 +98,10 @@ def distribusify(args, directory): # noqa
if mime == 'image' and args.thumbnail:
a = thumbnail(full_path, name, args)
else:
- cap = caption(full_path)
- if cap and args.captions:
- cap = "{}".format(cap)
+ if args.captions:
+ cap = caption(full_path)
else:
- cap = ''
+ cap = name
a = FILE_TYPES[mime].format(full_path, cap)
if format in FILE_TYPES:
diff --git a/setup.py b/setup.py
index efe3376..b1e00ec 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,6 @@
from setuptools import find_packages, setup
dependencies = [
- # pinned because https://github.com/python-pillow/Pillow/issues/2609
- 'pillow==4.1',
'python-magic==0.4.15',
]