Merge pull request #57 from kxepal/fix-detect-error-report

Fix chardet.detect exception
chardet · Apr 19, 2015 · ff40135 · ff40135
2 parents b8da859 + db77e13
commit ff40135
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/chardet/__init__.py b/chardet/__init__.py
@@ -16,16 +16,15 @@
 ######################### END LICENSE BLOCK #########################
 
 
-from .compat import PY2, PY3
+from .compat import PY2, PY3, bin_type as _bin_type
 from .universaldetector import UniversalDetector
 from .version import __version__, VERSION
 
 
 def detect(byte_str):
-    if (PY2 and isinstance(byte_str, unicode)) or (PY3 and
-                                               not isinstance(byte_str,
-                                                              bytes)):
-        raise ValueError('Expected a bytes object, not a unicode object')
+    if not isinstance(byte_str, _bin_type):
+        raise TypeError('Expected object of {0} type, got: {1}'
+                        ''.format(_bin_type, type(byte_str)))
 
     u = UniversalDetector()
     u.feed(byte_str)

diff --git a/chardet/compat.py b/chardet/compat.py
@@ -27,11 +27,13 @@
     PY3 = False
     base_str = (str, unicode)
     text_type = unicode
+    bin_type = str
 else:
     PY2 = False
     PY3 = True
     base_str = (bytes, str)
     text_type = str
+    bin_type = (bytes, bytearray)
 
 
 def wrap_ord(a):