parallel-ssh 2.15.0__py3-none-any.whl → 2.16.0__py3-none-any.whl

{parallel_ssh-2.15.0.dist-info → parallel_ssh-2.16.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: parallel-ssh
-Version: 2.15.0
+Version: 2.16.0
 Summary: Asynchronous parallel SSH library
 Home-page: https://github.com/ParallelSSH/parallel-ssh
 Author: Panos Kittenis

{parallel_ssh-2.15.0.dist-info → parallel_ssh-2.16.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
-parallel_ssh-2.15.0.dist-info/licenses/COPYING,sha256=ZA2Q9u5AEkH_YoNNDRsz-DBJ6ZuL_foE7RsKFjXd4-c,18093
-parallel_ssh-2.15.0.dist-info/licenses/COPYING.LESSER,sha256=AKibDRiqzUEU3s95Ei24e_Nb3a8rxQ44PJyfTCYzkLI,24486
-parallel_ssh-2.15.0.dist-info/licenses/LICENSE,sha256=m4cqigcLitMpxL04D7G_AAD1ZMdQI-yOHmgD8VNkuek,26461
+parallel_ssh-2.16.0.dist-info/licenses/COPYING,sha256=ZA2Q9u5AEkH_YoNNDRsz-DBJ6ZuL_foE7RsKFjXd4-c,18093
+parallel_ssh-2.16.0.dist-info/licenses/COPYING.LESSER,sha256=AKibDRiqzUEU3s95Ei24e_Nb3a8rxQ44PJyfTCYzkLI,24486
+parallel_ssh-2.16.0.dist-info/licenses/LICENSE,sha256=m4cqigcLitMpxL04D7G_AAD1ZMdQI-yOHmgD8VNkuek,26461
 pssh/__init__.py,sha256=-2ioNmlJK1Mg2BG2VMODs0uX4zjHWo09HQ2BDu0k8ZI,1491
 pssh/_version.py,sha256=ORfZeFepHteZV6a-ErdSrZvIosQNSSEdGlc5mCrLh0Q,24494
 pssh/config.py,sha256=BTdsCyLmwe8oBaveCWYy-Jdd8N2oPS7q0FlNtguqp2Q,11422
 pssh/constants.py,sha256=0CTBQp82r9eHhm0avOooor4VEQNBom720p9Yn5b2tFE,1103
 pssh/exceptions.py,sha256=fe4HKlIr0bWCdJGFIDowrT5fF231JqINsiJHx16nKhE,2694
-pssh/output.py,sha256=Tg1KeiK0zIQq_O8jf46jnPIoyWEdd89UNXwUaSJApPA,4712
+pssh/output.py,sha256=d1M9rqKmpxKf1muRvomGXr4yFyIL7DcXGbzWbSjuE-c,5765
 pssh/utils.py,sha256=Ly3J3G1De9nzujMsZvbnTEfV78bFl2-LkhLKkQTJftw,1849
 pssh/clients/__init__.py,sha256=m7fYfyw7G_Blc9-gPRDVKSY0w020pkD2n1WxDRrY3bk,883
 pssh/clients/common.py,sha256=Bb-dFiXwa-0Dtq2JXD1R7ojfJ_-IS91vORRBJ_sAX1Y,1765
 pssh/clients/reader.py,sha256=wGURuem2xMqnl7sad4bwcB8wrlI3x6HNADZnEGZSXCI,3139
 pssh/clients/base/__init__.py,sha256=dOC19H9XBNwDQFNnAz6WaRtzM7ZmFpyu86U8DofbOII,812
 pssh/clients/base/parallel.py,sha256=nkzHATvCbUfT_TmpgfZTZnQ-8I9aWcQvJnZf2BMSpfs,24889
-pssh/clients/base/single.py,sha256=_81t4J5BCL-h9lBw-yyD9YpFx-FaX9Cb1ML1q4FPZtI,27379
+pssh/clients/base/single.py,sha256=39sw_7SGK92D3-zfVvSCnEZHXXOeFQtWgEopbImmCV8,27544
 pssh/clients/native/__init__.py,sha256=CUZdR52b4tPyqrBKFUHJlOJRYEGkS3tXgl8q3wd73mA,912
 pssh/clients/native/parallel.py,sha256=bSzLVIEXLLtJDC6q2tlRv2R3wjSdvUWpDXACihFAJ-U,24933
 pssh/clients/native/single.py,sha256=Cj00SGxtqNrHu4l_J5P9TP9s_nJKzSVHNpMbStQ5h7g,35687
@@ -21,7 +21,7 @@ pssh/clients/native/tunnel.py,sha256=mZyKoblB_vZhQfQaVHQRlv7KWDd_MKcAhE-a72xv-MI
 pssh/clients/ssh/__init__.py,sha256=0oqNL4MXa1DwDX4nWM1nb5y12QkIqGYw1n_xpm-ePp4,904
 pssh/clients/ssh/parallel.py,sha256=fx1CGDgjlmbgQTGt9FDa9JGkDzkAb41y-RAF69rMV_s,11673
 pssh/clients/ssh/single.py,sha256=VDtN65-ELXD0BXGUt5u9FFMzArGCDqDJ_rdi8x0Stt4,14383
-parallel_ssh-2.15.0.dist-info/METADATA,sha256=JAaJJ9UcLWBCK6naRt7pVqGh0wRowvZ5HSdEXbiKzUo,11104
-parallel_ssh-2.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-parallel_ssh-2.15.0.dist-info/top_level.txt,sha256=s8P6ZHOwt2BYgDc62Cpd2z7i-rebGzIhhnO09pger0U,5
-parallel_ssh-2.15.0.dist-info/RECORD,,
+parallel_ssh-2.16.0.dist-info/METADATA,sha256=wRUuiHkcRw-weigpjXQ4TRx96UKbRVG9napqVYfr2h8,11104
+parallel_ssh-2.16.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+parallel_ssh-2.16.0.dist-info/top_level.txt,sha256=s8P6ZHOwt2BYgDc62Cpd2z7i-rebGzIhhnO09pger0U,5
+parallel_ssh-2.16.0.dist-info/RECORD,,

pssh/clients/base/single.py

@@ -158,7 +158,9 @@ class InteractiveShell(object):
         self._client._shell(self._chan)
         self._encoding = encoding
         self.output = self._client._make_host_output(
-            self._chan, encoding=encoding, read_timeout=read_timeout)
+            self._chan, encoding=encoding, read_timeout=read_timeout,
+            fully_qualified_command=None,
+        )
 
     @property
     def stdout(self):
@@ -471,7 +473,7 @@ class BaseSSHClient(PollMixIn):
     def open_session(self):
         raise NotImplementedError
 
-    def _make_host_output(self, channel, encoding, read_timeout):
+    def _make_host_output(self, channel, encoding, read_timeout, fully_qualified_command=None):
         _stdout_buffer = ConcurrentRWBuffer()
         _stderr_buffer = ConcurrentRWBuffer()
         _stdout_reader, _stderr_reader = self._make_output_readers(
@@ -484,7 +486,7 @@ class BaseSSHClient(PollMixIn):
         host_out = HostOutput(
             host=self.host, alias=self.alias, channel=channel, stdin=Stdin(channel, self),
             client=self, encoding=encoding, read_timeout=read_timeout,
-            buffers=_buffers,
+            buffers=_buffers, fully_qualified_command=fully_qualified_command,
         )
         return host_out
 
@@ -635,7 +637,7 @@ class BaseSSHClient(PollMixIn):
         with GTimeout(seconds=self.timeout):
             channel = self._execute(_command, use_pty=use_pty)
         _timeout = read_timeout if read_timeout else timeout
-        host_out = self._make_host_output(channel, encoding, _timeout)
+        host_out = self._make_host_output(channel, encoding, _timeout, fully_qualified_command=_command)
         return host_out
 
     def _make_sftp(self):

pssh/output.py

@@ -57,11 +57,14 @@ class HostOutput(object):
     __slots__ = ('host', 'channel', 'stdin',
                  'client', 'alias', 'exception',
                  'encoding', 'read_timeout', 'buffers',
+                 'fully_qualified_command',
                  )
 
     def __init__(self, host, channel, stdin,
                  client, alias=None, exception=None, encoding='utf-8', read_timeout=None,
-                 buffers=None):
+                 buffers=None,
+                 fully_qualified_command=None,
+                 ):
         """
         :param host: Host name output is for
         :type host: str
@@ -79,6 +82,15 @@ class HostOutput(object):
         :type read_timeout: float
         :param buffers: Host buffer data.
         :type buffers: :py:class:`HostOutputBuffers`
+        :param fully_qualified_command: The fully qualified command after any per-host argument substitution and
+          including command string substitution required for executing via sudo or user-switching via 'su -c', using
+          any specified shell on `run_command` *and* conversion to bytes via provided encoding.
+          The fully_qualified_command is therefor a bytes object that can be saved or otherwise used anywhere bytes can
+          be used without conversion.
+          Use `fully_qualified_command.decode(encoding)` to decode with the encoding used for the equivalent host
+          output object.
+          Always `None` on `HostOutput` from interactive shells.
+        :type fully_qualified_command: bytes
         """
         self.host = host
         self.channel = channel
@@ -89,6 +101,7 @@ class HostOutput(object):
         self.encoding = encoding
         self.read_timeout = read_timeout
         self.buffers = buffers
+        self.fully_qualified_command = fully_qualified_command
 
     @property
     def stdout(self):
@@ -125,10 +138,12 @@ class HostOutput(object):
             "\tchannel={channel}{linesep}" \
             "\texception={exception}{linesep}" \
             "\tencoding={encoding}{linesep}" \
-            "\tread_timeout={read_timeout}".format(
+            "\tread_timeout={read_timeout}{linesep}" \
+            "\tfully_qualified_command={fully_qualified_command}".format(
                 host=self.host, alias=self.alias, channel=self.channel,
                 exception=self.exception, linesep=linesep,
                 exit_code=self.exit_code, encoding=self.encoding, read_timeout=self.read_timeout,
+                fully_qualified_command=self.fully_qualified_command,
             )
 
     def __str__(self):