Merge pull request #204 from mdaniel/better-type-errors

Better type errors

1 files changed, 8 insertions, 1 deletions

diff --git a/kafka/util.py b/kafka/util.py
index a918234..9121374 100644
--- a/kafka/util.py
+++ b/kafka/util.py
@@ -7,6 +7,9 @@ from kafka.common import BufferUnderflowError
 
 
 def write_int_string(s):
+    if s is not None and not isinstance(s, str):
+        raise TypeError('Expected "%s" to be str\n'
+                        'data=%s' % (type(s), repr(s)))
     if s is None:
         return struct.pack('>i', -1)
     else:
@@ -14,9 +17,12 @@ def write_int_string(s):
 
 
 def write_short_string(s):
+    if s is not None and not isinstance(s, str):
+        raise TypeError('Expected "%s" to be str\n'
+                        'data=%s' % (type(s), repr(s)))
     if s is None:
         return struct.pack('>h', -1)
-    elif len(s) > 32767 and sys.version < (2,7):
+    elif len(s) > 32767 and sys.version < (2, 7):
         # Python 2.6 issues a deprecation warning instead of a struct error
         raise struct.error(len(s))
     else:
@@ -117,4 +123,5 @@ class ReentrantTimer(object):
 
         self.active.set()
         self.thread.join(self.t + 1)
+        # noinspection PyAttributeOutsideInit
         self.timer = None