Skip to content

Commit 900d5a2

Browse files
authored
bug fix __str__ returns bytes
1 parent efd6789 commit 900d5a2

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

impacket/structure.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111
from __future__ import print_function
1212
from struct import pack, unpack, calcsize
1313
from six import b, PY3
14-
from sys import stdout
14+
from binascii import hexlify
1515

1616

17-
encoding = stdout.encoding
18-
1917
class Structure:
2018
""" sublcasses can define commonHdr and/or structure.
2119
each of them is an tuple of either two: (fieldName, format) or three: (fieldName, ':', class) fields.
@@ -164,7 +162,7 @@ def fromString(self, data):
164162
data = data[size:]
165163

166164
return self
167-
165+
168166
def __setitem__(self, key, value):
169167
self.fields[key] = value
170168
self.data = None # force recompute
@@ -174,9 +172,9 @@ def __getitem__(self, key):
174172

175173
def __delitem__(self, key):
176174
del self.fields[key]
177-
175+
178176
def __str__(self):
179-
return self.getData().decode(encoding)
177+
return hexlify(self.getData())
180178

181179
def __len__(self):
182180
# XXX: improve

0 commit comments

Comments
 (0)