64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
diff --git a/client-py3/full/src/uds/log.py b/client-py3/full/src/uds/log.py
|
|
index 4c4446c4..4bd5ecf3 100644
|
|
--- a/client-py3/full/src/uds/log.py
|
|
+++ b/client-py3/full/src/uds/log.py
|
|
@@ -40,7 +40,7 @@ if sys.platform.startswith('linux'):
|
|
from os.path import expanduser # pylint: disable=ungrouped-imports
|
|
logFile = expanduser('~/udsclient.log')
|
|
else:
|
|
- logFile = os.path.join(tempfile.gettempdir(), b'udsclient.log')
|
|
+ logFile = os.path.join(tempfile.gettempdir(), 'udsclient.log')
|
|
|
|
try:
|
|
logging.basicConfig(
|
|
diff --git a/client-py3/full/src/uds/tools.py b/client-py3/full/src/uds/tools.py
|
|
index 5c4b93dd..0112db66 100644
|
|
--- a/client-py3/full/src/uds/tools.py
|
|
+++ b/client-py3/full/src/uds/tools.py
|
|
@@ -75,9 +75,9 @@ def saveTempFile(content, filename=None):
|
|
filename = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(16))
|
|
filename = filename + '.uds'
|
|
|
|
- if 'win32' in sys.platform:
|
|
- logger.info('Fixing for win32')
|
|
- filename = filename.encode(sys_fs_enc)
|
|
+ #if 'win32' in sys.platform:
|
|
+ # logger.info('Fixing for win32')
|
|
+ # filename = filename.encode(sys_fs_enc)
|
|
|
|
filename = os.path.join(tempfile.gettempdir(), filename)
|
|
|
|
@@ -89,8 +89,8 @@ def saveTempFile(content, filename=None):
|
|
|
|
|
|
def readTempFile(filename):
|
|
- if 'win32' in sys.platform:
|
|
- filename = filename.encode('utf-8')
|
|
+ #if 'win32' in sys.platform:
|
|
+ # filename = filename.encode('utf-8')
|
|
|
|
filename = os.path.join(tempfile.gettempdir(), filename)
|
|
try:
|
|
@@ -110,8 +110,8 @@ def testServer(host, port, timeOut=4):
|
|
|
|
|
|
def findApp(appName, extraPath=None):
|
|
- if 'win32' in sys.platform and isinstance(appName, six.text_type):
|
|
- appName = appName.encode(sys_fs_enc)
|
|
+ #if 'win32' in sys.platform and isinstance(appName, six.text_type):
|
|
+ # appName = appName.encode(sys_fs_enc)
|
|
searchPath = os.environ['PATH'].split(os.pathsep)
|
|
if extraPath is not None:
|
|
searchPath += list(extraPath)
|
|
@@ -129,8 +129,8 @@ def getHostName():
|
|
In fact, it's a wrapper for socket.gethostname()
|
|
'''
|
|
hostname = socket.gethostname()
|
|
- if 'win32' in sys.platform:
|
|
- hostname = hostname.decode(sys_fs_enc)
|
|
+ #if 'win32' in sys.platform:
|
|
+ # hostname = hostname.decode(sys_fs_enc)
|
|
|
|
hostname = six.text_type(hostname)
|
|
logger.info('Hostname: %s', hostname)
|