Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-07-28 15:05:21 +02:00
commit 0c3a2c660a
3 files changed
+7 -3

No files matched your search

+2 -1
View File
@@ -91,7 +91,8 @@ def md5sum(path):
try:
with open(path + '.md5sum') as f:
return f.read()
except OSError:
# Unicode error is when user rename an image to .md5sum ....
except (OSError, UnicodeDecodeError):
pass
try: