Skip to content
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

Jump to bottom

Fix encoding error #27

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

Fix encoding error #27

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
10 changes: 8 additions & 2 deletions htpclient/initialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import uuid
import locale
from time import sleep

from htpclient.dicts import *
Expand Down Expand Up @@ -102,15 +103,20 @@ def __update_information(self):
devices.append(line[2].strip())

elif Initialize.get_os() == 1: # windows
defaultlocale = locale.getdefaultlocale()
localEncoding = "uft-8";
if len(defaultlocale) >= 2:
localEncoding = locale.getdefaultlocale()[1];

output = subprocess.check_output("wmic cpu get name", shell=True)
output = output.decode(encoding='utf-8').replace("\r\n", "\n").split("\n")
output = output.decode(encoding=localEncoding).replace("\r\n", "\n").split("\n")
for line in output:
line = line.rstrip("\r\n ")
if line == "Name" or not line:
continue
devices.append(line)
output = subprocess.check_output("wmic path win32_VideoController get name", shell=True)
output = output.decode(encoding='utf-8').replace("\r\n", "\n").split("\n")
output = output.decode(encoding=localEncoding).replace("\r\n", "\n").split("\n")
for line in output:
line = line.rstrip("\r\n ")
if line == "Name" or not line:
Expand Down