From 50e6b029a5294cf672fd5dd4e3afaee5e225e098 Mon Sep 17 00:00:00 2001 From: Hu Shiwen Date: Sun, 1 Jul 2018 22:44:23 +0800 Subject: [PATCH 1/5] change to friendly error message --- python/mxnet/image/image.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/mxnet/image/image.py b/python/mxnet/image/image.py index b4b9cc2f1c08..a0e7dea632d7 100644 --- a/python/mxnet/image/image.py +++ b/python/mxnet/image/image.py @@ -133,6 +133,8 @@ def imdecode(buf, *args, **kwargs): """ if not isinstance(buf, nd.NDArray): + if sys.version_info[0] == 3 and not (isinstance(buf, bytes) or isinstance(buf, np.ndarray)): + raise ValueError('buf must bytes or numpy.ndarray,if you input str,please convert it to bytes') buf = nd.array(np.frombuffer(buf, dtype=np.uint8), dtype=np.uint8) return _internal._cvimdecode(buf, *args, **kwargs) From 8ba6fb55feef9e5372a401b96237524a892d236a Mon Sep 17 00:00:00 2001 From: Hu Shiwen Date: Mon, 2 Jul 2018 11:12:53 +0800 Subject: [PATCH 2/5] fix lint --- python/mxnet/image/image.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python/mxnet/image/image.py b/python/mxnet/image/image.py index a0e7dea632d7..ab25d43d716b 100644 --- a/python/mxnet/image/image.py +++ b/python/mxnet/image/image.py @@ -27,6 +27,7 @@ import json import warnings import numpy as np +import sys try: import cv2 @@ -133,8 +134,10 @@ def imdecode(buf, *args, **kwargs): """ if not isinstance(buf, nd.NDArray): - if sys.version_info[0] == 3 and not (isinstance(buf, bytes) or isinstance(buf, np.ndarray)): - raise ValueError('buf must bytes or numpy.ndarray,if you input str,please convert it to bytes') + if sys.version_info[0] == 3 \ + and not (isinstance(buf, bytes) or isinstance(buf, np.ndarray)): + raise ValueError('buf must bytes or numpy.ndarray,' + 'if you input str,please convert it to bytes') buf = nd.array(np.frombuffer(buf, dtype=np.uint8), dtype=np.uint8) return _internal._cvimdecode(buf, *args, **kwargs) From a419ecd35923594a3cd1ada39f2f57da2d27e39e Mon Sep 17 00:00:00 2001 From: Hu Shiwen Date: Mon, 2 Jul 2018 19:44:47 +0800 Subject: [PATCH 3/5] fix lint --- python/mxnet/image/image.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/mxnet/image/image.py b/python/mxnet/image/image.py index ab25d43d716b..e1e3ceab4bdb 100644 --- a/python/mxnet/image/image.py +++ b/python/mxnet/image/image.py @@ -21,13 +21,14 @@ from __future__ import absolute_import, print_function +import sys import os import random import logging import json import warnings import numpy as np -import sys + try: import cv2 From 96a69741b0006c2a1bff3bd2ee45017c0c431b47 Mon Sep 17 00:00:00 2001 From: Hu Shiwen Date: Mon, 2 Jul 2018 20:18:14 +0800 Subject: [PATCH 4/5] fix lint --- python/mxnet/image/image.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/mxnet/image/image.py b/python/mxnet/image/image.py index e1e3ceab4bdb..97223d64df10 100644 --- a/python/mxnet/image/image.py +++ b/python/mxnet/image/image.py @@ -135,8 +135,7 @@ def imdecode(buf, *args, **kwargs): """ if not isinstance(buf, nd.NDArray): - if sys.version_info[0] == 3 \ - and not (isinstance(buf, bytes) or isinstance(buf, np.ndarray)): + if sys.version_info[0] == 3 and not isinstance(buf, (bytes, np.ndarray)): raise ValueError('buf must bytes or numpy.ndarray,' 'if you input str,please convert it to bytes') buf = nd.array(np.frombuffer(buf, dtype=np.uint8), dtype=np.uint8) From 8bd8a5f896124f8dc2eeda046796939aef0e4494 Mon Sep 17 00:00:00 2001 From: Hu Shiwen Date: Fri, 14 Sep 2018 20:46:46 +0800 Subject: [PATCH 5/5] update raise message --- python/mxnet/image/image.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/mxnet/image/image.py b/python/mxnet/image/image.py index 97223d64df10..59ebcdd5f3f6 100644 --- a/python/mxnet/image/image.py +++ b/python/mxnet/image/image.py @@ -136,8 +136,8 @@ def imdecode(buf, *args, **kwargs): """ if not isinstance(buf, nd.NDArray): if sys.version_info[0] == 3 and not isinstance(buf, (bytes, np.ndarray)): - raise ValueError('buf must bytes or numpy.ndarray,' - 'if you input str,please convert it to bytes') + raise ValueError('buf must be of type bytes or numpy.ndarray,' + 'if you would like to input type str, please convert to bytes') buf = nd.array(np.frombuffer(buf, dtype=np.uint8), dtype=np.uint8) return _internal._cvimdecode(buf, *args, **kwargs)