Skip to content

Fixes for python 3.3.*. Tested under windows. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tgreiser wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes for python 3.3.*. Tested under windows. #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions GetSysUUID.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ def __call__(self):
##Return the actual UUID or a hash of it
if self.p_anonymous:
self.uuid = hashlib.md5(self.uuid).hexdigest()
print "MD5 (UUID): %s"%self.uuid
print ("MD5 (UUID): %s"%self.uuid)
else:
print "UUID: %s"%self.uuid
print ("UUID: %s"%self.uuid)

return self.uuid

Expand Down Expand Up @@ -124,7 +124,7 @@ def _get_win32_uuid(self):
bios_size = get_fw(ctypes.wintypes.DWORD(1381190978), 0, 0, 0)

##Buffer for BIOS to be written to
FirmwareTableBuf = ctypes.create_string_buffer("\000"*bios_size)
FirmwareTableBuf = ctypes.create_string_buffer(b"\000"*bios_size)

##Now actually dump the Raw SMBIOS table
ret = get_fw(ctypes.wintypes.DWORD(FirmwareTableSig),
Expand Down Expand Up @@ -187,8 +187,8 @@ def walk_structure(self):
"""
while 1:
try:
formatted_len = struct.unpack("<B", self.SMBIOSTableData[1] )[0]
except IndexError:
formatted_len = struct.unpack("<B", self.SMBIOSTableData[1:2] )[0]
except struct.error:
##Reached the end of the structure
break

Expand All @@ -209,17 +209,17 @@ def parse_type1(self):
raw_data = self.table_data[1]
self.type1_data = {}

self.type1_data["Length"] = struct.unpack("<B", raw_data[1])[0]
self.type1_data["Length"] = struct.unpack("<B", raw_data[1:2])[0]
self.type1_data["Handle"] = struct.unpack("<H", raw_data[2:4])[0]
self.type1_data["Manufacturer"] = struct.unpack("<B", raw_data[5])[0]
self.type1_data["Product Name"] = struct.unpack("<B", raw_data[6])[0]
self.type1_data["Version"] = struct.unpack("<B", raw_data[7])[0]
self.type1_data["Serial Number"] = struct.unpack("<B", raw_data[8])[0]
self.type1_data["Manufacturer"] = struct.unpack("<B", raw_data[5:6])[0]
self.type1_data["Product Name"] = struct.unpack("<B", raw_data[6:7])[0]
self.type1_data["Version"] = struct.unpack("<B", raw_data[7:8])[0]
self.type1_data["Serial Number"] = struct.unpack("<B", raw_data[8:9])[0]
self.type1_data["UUID"] = struct.unpack("<16B", raw_data[8:24])
self.type1_data["Wake-up Type"] = struct.unpack("<B", raw_data[25])[0]
self.type1_data["Wake-up Type"] = struct.unpack("<B", raw_data[25:26])[0]
try:
self.type1_data["SKU Number"] = struct.unpack("<B", raw_data[26])[0]
self.type1_data["Family"] = struct.unpack("<B", raw_data[27])[0]
self.type1_data["SKU Number"] = struct.unpack("<B", raw_data[26:27])[0]
self.type1_data["Family"] = struct.unpack("<B", raw_data[27:28])[0]
except IndexError:
pass

Expand Down