diff options
Diffstat (limited to 'kafka/util.py')
| -rw-r--r-- | kafka/util.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/kafka/util.py b/kafka/util.py index 598ba84..e4a3db0 100644 --- a/kafka/util.py +++ b/kafka/util.py @@ -24,16 +24,16 @@ def read_short_string(data, cur): if len(data) < cur + 2: raise BufferUnderflowError("Not enough data left") - (strLen,) = struct.unpack('>h', data[cur:cur + 2]) - if strLen == -1: + (strlen,) = struct.unpack('>h', data[cur:cur + 2]) + if strlen == -1: return (None, cur + 2) cur += 2 - if len(data) < cur + strLen: + if len(data) < cur + strlen: raise BufferUnderflowError("Not enough data left") - out = data[cur:cur + strLen] - return (out, cur + strLen) + out = data[cur:cur + strlen] + return (out, cur + strlen) def read_int_string(data, cur): @@ -41,17 +41,16 @@ def read_int_string(data, cur): raise BufferUnderflowError( "Not enough data left to read string len (%d < %d)" % (len(data), cur + 4)) - (strLen,) = struct.unpack('>i', data[cur:cur + 4]) - if strLen == -1: + (strlen,) = struct.unpack('>i', data[cur:cur + 4]) + if strlen == -1: return (None, cur + 4) cur += 4 - if len(data) < cur + strLen: - raise BufferUnderflowError( - "Not enough data left to read string (%d < %d)" % (len(data), cur + strLen)) + if len(data) < cur + strlen: + raise BufferUnderflowError("Not enough data left") - out = data[cur:cur + strLen] - return (out, cur + strLen) + out = data[cur:cur + strlen] + return (out, cur + strlen) def relative_unpack(fmt, data, cur): |