Tweaked the error return from Document.get_document_content() to be more helpful during development.

- Legacy-Id: 15034
This commit is contained in:
Henrik Levkowetz 2018-04-09 14:01:37 +00:00
parent 98bba9c104
commit b5d62973c7

View file

@ -314,7 +314,10 @@ def get_unicode_document_content(key, filename, codec='utf-8', errors='ignore'):
with open(filename, 'rb') as f:
raw_content = f.read().decode(codec,errors)
except IOError:
error = "Error; cannot read ("+key+")"
if settings.DEBUG:
error = "Error; cannot read ("+filename+")"
else:
error = "Error; cannot read ("+key+")"
return error
return raw_content
@ -325,7 +328,10 @@ def get_document_content(key, filename, split=True, markup=True):
with open(filename, 'rb') as f:
raw_content = f.read()
except IOError:
error = "Error; cannot read ("+key+")"
if settings.DEBUG:
error = "Error; cannot read ("+filename+")"
else:
error = "Error; cannot read ("+key+")"
return error
# if markup: