From e8baf2a1575c7cf1341f9cc1c880e7c812b4d0c3 Mon Sep 17 00:00:00 2001 From: Pawel Marczewski Date: Fri, 24 Jan 2020 16:59:20 +0100 Subject: [PATCH] Remove leftovers from QubesVM.run_for_stdio() refactoring We no longer use qubes.VMShell there. --- qubes/vm/qubesvm.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py index 9df7190f..d30012ee 100644 --- a/qubes/vm/qubesvm.py +++ b/qubes/vm/qubesvm.py @@ -1449,14 +1449,6 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM): return stdouterr - @staticmethod - def _prepare_input_for_vmshell(command, input): - """Prepare shell input for the given command and optional (real) input - """ # pylint: disable=redefined-builtin - if input is None: - input = b'' - return b''.join((command.rstrip('\n').encode('utf-8'), b'\n', input)) - def run(self, command, user=None, **kwargs): """Run a shell command inside the domain using qrexec. @@ -1474,12 +1466,9 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM): @asyncio.coroutine def run_for_stdio(self, *args, input=None, **kwargs): - """Run a shell command inside the domain using qubes.VMShell qrexec. + """Run a shell command inside the domain using qrexec. This method is a coroutine. - - *kwargs* are passed verbatim to :py:meth:`run_service_for_stdio`. - See disclaimer there. """ # pylint: disable=redefined-builtin kwargs.setdefault('stdin', subprocess.PIPE)