Convert buffer(...) -> bytes(...) for Python 3 compatibility.
W. Trevor King
11 years ago
| 81 | 81 |
if end > start:
|
| 82 | 82 |
strings.append(d[start:end])
|
| 83 | 83 |
if self._null_terminated:
|
| 84 | |
strings[-1] = strings[-1].split('\x00', 1)[0]
|
|
84 |
strings[-1] = strings[-1].split(b'\x00', 1)[0]
|
| 85 | 85 |
start = end
|
| 86 | 86 |
elif self._null_terminated:
|
| 87 | |
d = d.split('\x00', 1)[0]
|
|
87 |
d = d.split(b'\x00', 1)[0]
|
| 88 | 88 |
return d
|
| 89 | 89 |
|
| 90 | 90 |
|
| 66 | 66 |
while True:
|
| 67 | 67 |
PackedFileRecordHeader.byte_order = initial_byte_order
|
| 68 | 68 |
PackedFileRecordHeader.setup()
|
| 69 | |
b = buffer(f.read(PackedFileRecordHeader.size))
|
|
69 |
b = bytes(f.read(PackedFileRecordHeader.size))
|
| 70 | 70 |
if not b:
|
| 71 | 71 |
break
|
| 72 | 72 |
if len(b) < PackedFileRecordHeader.size:
|
|
| 87 | 87 |
header = PackedFileRecordHeader.unpack_from(b)
|
| 88 | 88 |
_LOG.debug(
|
| 89 | 89 |
'reordered version: {}'.format(header['version']))
|
| 90 | |
data = buffer(f.read(header['numDataBytes']))
|
|
90 |
data = bytes(f.read(header['numDataBytes']))
|
| 91 | 91 |
if len(data) < header['numDataBytes']:
|
| 92 | 92 |
raise ValueError(
|
| 93 | 93 |
('not enough data for the next record ({} < {})'
|