From 703c7f2ec2df0f0995048969cd3515dceca5f7ae Mon Sep 17 00:00:00 2001 From: hakril Date: Fri, 14 Jun 2024 14:22:21 +0200 Subject: [PATCH] Fix windows.native_exec.cpuid for py3 --- tests/test_cpuid.py | 6 ++++++ windows/native_exec/cpuid.py | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 tests/test_cpuid.py diff --git a/tests/test_cpuid.py b/tests/test_cpuid.py new file mode 100644 index 0000000..004fe95 --- /dev/null +++ b/tests/test_cpuid.py @@ -0,0 +1,6 @@ +import windows +import windows.native_exec.cpuid + +def test_native_exec_cpuid(): + assert windows.native_exec.cpuid.do_cpuid(0) + assert windows.native_exec.cpuid.get_proc_family_model() \ No newline at end of file diff --git a/windows/native_exec/cpuid.py b/windows/native_exec/cpuid.py index b08cd88..2b8dd9d 100644 --- a/windows/native_exec/cpuid.py +++ b/windows/native_exec/cpuid.py @@ -1,9 +1,9 @@ import ctypes import struct -import native_function -import simple_x86 as x86 -import simple_x64 as x64 +from windows.native_exec import native_function +import windows.native_exec.simple_x86 as x86 +import windows.native_exec.simple_x64 as x64 from windows.generated_def.winstructs import * @@ -126,13 +126,13 @@ def get_vendor_id(): # platform.processor() could do the trick def is_intel_proc(): - """get_vendor_id() == 'GenuineIntel'""" - return get_vendor_id() == "GenuineIntel" + """get_vendor_id() == b'GenuineIntel'""" + return get_vendor_id() == b"GenuineIntel" def is_amd_proc(): - """get_vendor_id() == 'AuthenticAMD'""" - return get_vendor_id() == "AuthenticAMD" + """get_vendor_id() == b'AuthenticAMD'""" + return get_vendor_id() == b"AuthenticAMD" def get_proc_family_model():