arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-03 13:48:11 +00:00
Code Issues Releases Wiki Activity

Do not use universal_newlines in subprocess.

Browse Source
This commit is contained in:
Jeremy 2014-11-26 15:07:15 -07:00
parent d97ba11728
commit 183a6aed44
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/modules/virtualbox/__init__.py
View File

@ -716,10 +716,10 @@ class VirtualBox(IModule):
""" """
try: try:
result = subprocess.check_output(command, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30) result = subprocess.check_output(command, stderr=subprocess.STDOUT, timeout=30)
except subprocess.SubprocessError as e: except subprocess.SubprocessError as e:
raise VirtualBoxError("Could not execute VBoxManage {}".format(e)) raise VirtualBoxError("Could not execute VBoxManage {}".format(e))
return result return result.decode("utf-8")
@IModule.route("virtualbox.vm_list") @IModule.route("virtualbox.vm_list")
def vm_list(self, request): def vm_list(self, request):

6
gns3server/modules/virtualbox/virtualbox_vm.py
View File

@ -550,17 +550,17 @@ class VirtualBoxVM(object):
command.extend(args) command.extend(args)
log.debug("Execute vboxmanage command: {}".format(command)) log.debug("Execute vboxmanage command: {}".format(command))
try: try:
result = subprocess.check_output(command, stderr=subprocess.STDOUT, universal_newlines=True, timeout=timeout) result = subprocess.check_output(command, stderr=subprocess.STDOUT, timeout=timeout)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
if e.output: if e.output:
# only the first line of the output is useful # only the first line of the output is useful
virtualbox_error = e.output.splitlines()[0] virtualbox_error = e.output.decode("utf-8").splitlines()[0]
raise VirtualBoxError("{}".format(virtualbox_error)) raise VirtualBoxError("{}".format(virtualbox_error))
else: else:
raise VirtualBoxError("{}".format(e)) raise VirtualBoxError("{}".format(e))
except subprocess.SubprocessError as e: except subprocess.SubprocessError as e:
raise VirtualBoxError("Could not execute VBoxManage: {}".format(e)) raise VirtualBoxError("Could not execute VBoxManage: {}".format(e))
return result.splitlines() return result.decode("utf-8").splitlines()
def _get_vm_info(self): def _get_vm_info(self):
""" """