Commit 04398abd by Csók Tamás

client: accented char corrections

parent 0db34f31
...@@ -7,14 +7,16 @@ of the CIRCLE cloud. Handles the auto launch and auto configuration ...@@ -7,14 +7,16 @@ of the CIRCLE cloud. Handles the auto launch and auto configuration
of these specific connectivity programs. of these specific connectivity programs.
""" """
import time import binascii
import glob
import locale
import logging
import nxkey
import os import os
import subprocess import subprocess
import glob import time
import win32crypt import win32crypt
import binascii
import nxkey
import logging
from windowsclasses import ClientRegistry from windowsclasses import ClientRegistry
...@@ -34,7 +36,7 @@ def connect(vm): ...@@ -34,7 +36,7 @@ def connect(vm):
logger.debug('Connect methods started') logger.debug('Connect methods started')
if vm.protocol == "SSH": if vm.protocol == "SSH":
logger.info('SSH protocol received') logger.info('SSH protocol received')
arguments = ("-ssh -P %(port)s -pw %(password)s" arguments = str("-ssh -P %(port)s -pw %(password)s"
" %(user)s@%(host)s" % { " %(user)s@%(host)s" % {
'port': vm.port, 'port': vm.port,
'password': vm.password, 'password': vm.password,
...@@ -71,7 +73,8 @@ def connect(vm): ...@@ -71,7 +73,8 @@ def connect(vm):
f.close() f.close()
logger.info('Config file created: %s', config_file) logger.info('Config file created: %s', config_file)
logger.debug('Popen the config file: %s', config_file) logger.debug('Popen the config file: %s', config_file)
subprocess.Popen('"%s"' % config_file, shell=True) subprocess.Popen((u'"%s"' % config_file).encode(
locale.getpreferredencoding()), shell=True)
elif vm.protocol == "RDP": elif vm.protocol == "RDP":
logger.info('RDP protocol received') logger.info('RDP protocol received')
listdir = ClientRegistry.directory() + "\\.rdp\\*.rdp" listdir = ClientRegistry.directory() + "\\.rdp\\*.rdp"
...@@ -99,7 +102,8 @@ def connect(vm): ...@@ -99,7 +102,8 @@ def connect(vm):
f.close() f.close()
logger.info('Config file created: %s', config_file) logger.info('Config file created: %s', config_file)
logger.debug('Popen the config file: %s', config_file) logger.debug('Popen the config file: %s', config_file)
subprocess.Popen('"%s"' % config_file, shell=True) subprocess.Popen((u'"%s"' % config_file).encode(
locale.getpreferredencoding()), shell=True)
logger.info('Client finished working') logger.info('Client finished working')
NX_template = """<!DOCTYPE NXClientSettings> NX_template = """<!DOCTYPE NXClientSettings>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment