Merge pull request #566 from larsmans/error-messages

more detailed error messages from Image.py
This commit is contained in:
Alex Clark ☺ 2014-03-25 17:54:53 -04:00
commit 2febf7cfa3
2 changed files with 7 additions and 3 deletions

3
.gitignore vendored
View File

@ -5,3 +5,6 @@ dist
.tox .tox
*.so *.so
docs/_build docs/_build
# Vim cruft
.*.swp

View File

@ -1965,7 +1965,7 @@ def fromarray(obj, mode=None):
else: else:
ndmax = 4 ndmax = 4
if ndim > ndmax: if ndim > ndmax:
raise ValueError("Too many dimensions.") raise ValueError("Too many dimensions: %d > %d." % (ndim, ndmax))
size = shape[1], shape[0] size = shape[1], shape[0]
if strides is not None: if strides is not None:
@ -2018,7 +2018,7 @@ def open(fp, mode="r"):
""" """
if mode != "r": if mode != "r":
raise ValueError("bad mode") raise ValueError("bad mode %r" % mode)
if isPath(fp): if isPath(fp):
filename = fp filename = fp
@ -2054,7 +2054,8 @@ def open(fp, mode="r"):
#traceback.print_exc() #traceback.print_exc()
pass pass
raise IOError("cannot identify image file") raise IOError("cannot identify image file %r"
% (filename if filename else fp))
# #
# Image processing. # Image processing.