ansible-core 2.19.0b4__py3-none-any.whl → 2.19.0b5__py3-none-any.whl

ansible/plugins/list.py

@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 
+import dataclasses
 import os
 
 from ansible import context
@@ -14,6 +15,7 @@ from ansible.module_utils.common.text.converters import to_native, to_bytes
 from ansible.plugins import loader
 from ansible.utils.display import Display
 from ansible.utils.collection_loader._collection_finder import _get_collection_path
+from ansible._internal._templating._jinja_plugins import get_jinja_builtin_plugin_descriptions
 
 display = Display()
 
@@ -25,6 +27,20 @@ IGNORE = {
 }
 
 
+@dataclasses.dataclass(kw_only=True, frozen=True, slots=True)
+class _PluginDocMetadata:
+    """Information about a plugin."""
+
+    name: str
+    """The fully qualified name of the plugin."""
+    path: bytes | None = None
+    """The path to the plugin file, or None if not available."""
+    plugin_obj: object | None = None
+    """The loaded plugin object, or None if not loaded."""
+    jinja_builtin_short_description: str | None = None
+    """The short description of the plugin if it is a Jinja builtin, otherwise None."""
+
+
 def get_composite_name(collection, name, path, depth):
     resolved_collection = collection
     if '.' not in name:
@@ -116,21 +132,37 @@ def _list_j2_plugins_from_file(collection, plugin_path, ptype, plugin_name):
     return file_plugins
 
 
-def list_collection_plugins(ptype, collections, search_paths=None):
+def list_collection_plugins(ptype: str, collections: dict[str, bytes], search_paths: list[str] | None = None) -> dict[str, tuple[bytes, object | None]]:
+    # Kept for backwards compatibility.
+    return {
+        name: (info.path, info.plugin_obj)
+        for name, info in _list_collection_plugins_with_info(ptype, collections).items()
+    }
+
+
+def _list_collection_plugins_with_info(
+    ptype: str,
+    collections: dict[str, bytes],
+) -> dict[str, _PluginDocMetadata]:
     # TODO: update to use importlib.resources
 
-    # starts at  {plugin_name: filepath, ...}, but changes at the end
-    plugins = {}
     try:
         ploader = getattr(loader, '{0}_loader'.format(ptype))
     except AttributeError:
         raise AnsibleError(f"Cannot list plugins, incorrect plugin type {ptype!r} supplied.") from None
 
+    builtin_jinja_plugins = {}
+    plugin_paths = {}
+
     # get plugins for each collection
-    for collection in collections.keys():
+    for collection, path in collections.items():
         if collection == 'ansible.builtin':
             # dirs from ansible install, but not configured paths
             dirs = [d.path for d in ploader._get_paths_with_context() if d.internal]
+
+            if ptype in ('filter', 'test'):
+                builtin_jinja_plugins = get_jinja_builtin_plugin_descriptions(ptype)
+
         elif collection == 'ansible.legacy':
             # configured paths + search paths (should include basedirs/-M)
             dirs = [d.path for d in ploader._get_paths_with_context() if not d.internal]
@@ -139,7 +171,7 @@ def list_collection_plugins(ptype, collections, search_paths=None):
         else:
             # search path in this case is for locating collection itselfA
             b_ptype = to_bytes(C.COLLECTION_PTYPE_COMPAT.get(ptype, ptype))
-            dirs = [to_native(os.path.join(collections[collection], b'plugins', b_ptype))]
+            dirs = [to_native(os.path.join(path, b'plugins', b_ptype))]
             # acr = AnsibleCollectionRef.try_parse_fqcr(collection, ptype)
             # if acr:
             #     dirs = acr.subdirs
@@ -147,30 +179,51 @@ def list_collection_plugins(ptype, collections, search_paths=None):
 
             #     raise Exception('bad acr for %s, %s' % (collection, ptype))
 
-        plugins.update(_list_plugins_from_paths(ptype, dirs, collection))
+        plugin_paths.update(_list_plugins_from_paths(ptype, dirs, collection))
 
-    #  return plugin and it's class object, None for those not verifiable or failing
+    plugins = {}
     if ptype in ('module',):
         # no 'invalid' tests for modules
-        for plugin in plugins.keys():
-            plugins[plugin] = (plugins[plugin], None)
+        for plugin, plugin_path in plugin_paths.items():
+            plugins[plugin] = _PluginDocMetadata(name=plugin, path=plugin_path)
     else:
         # detect invalid plugin candidates AND add loaded object to return data
-        for plugin in list(plugins.keys()):
+        for plugin, plugin_path in plugin_paths.items():
             pobj = None
             try:
                 pobj = ploader.get(plugin, class_only=True)
             except Exception as e:
-                display.vvv("The '{0}' {1} plugin could not be loaded from '{2}': {3}".format(plugin, ptype, plugins[plugin], to_native(e)))
+                display.vvv("The '{0}' {1} plugin could not be loaded from '{2}': {3}".format(plugin, ptype, plugin_path, to_native(e)))
 
-            # sets final {plugin_name: (filepath, class|NONE if not loaded), ...}
-            plugins[plugin] = (plugins[plugin], pobj)
+            plugins[plugin] = _PluginDocMetadata(
+                name=plugin,
+                path=plugin_path,
+                plugin_obj=pobj,
+                jinja_builtin_short_description=builtin_jinja_plugins.get(plugin),
+            )
+
+        # Add in any builtin Jinja2 plugins that have not been shadowed in Ansible.
+        plugins.update(
+            (plugin_name, _PluginDocMetadata(name=plugin_name, jinja_builtin_short_description=plugin_description))
+            for plugin_name, plugin_description in builtin_jinja_plugins.items() if plugin_name not in plugins
+        )
 
-    # {plugin_name: (filepath, class), ...}
     return plugins
 
 
-def list_plugins(ptype, collections=None, search_paths=None):
+def list_plugins(ptype: str, collections: list[str] | None = None, search_paths: list[str] | None = None) -> dict[str, tuple[bytes, object | None]]:
+    # Kept for backwards compatibility.
+    return {
+        name: (info.path, info.plugin_obj)
+        for name, info in _list_plugins_with_info(ptype, collections, search_paths).items()
+    }
+
+
+def _list_plugins_with_info(
+    ptype: str,
+    collections: list[str] = None,
+    search_paths: list[str] | None = None,
+) -> dict[str, _PluginDocMetadata]:
     if isinstance(collections, str):
         collections = [collections]
 
@@ -195,7 +248,7 @@ def list_plugins(ptype, collections=None, search_paths=None):
                     raise AnsibleError(f"Cannot use supplied collection {collection!r}.") from ex
 
     if plugin_collections:
-        plugins.update(list_collection_plugins(ptype, plugin_collections))
+        plugins.update(_list_collection_plugins_with_info(ptype, plugin_collections))
 
     return plugins
 

ansible/plugins/loader.py

@@ -26,6 +26,7 @@ from ansible import __version__ as ansible_version
 from ansible import _internal, constants as C
 from ansible.errors import AnsibleError, AnsiblePluginCircularRedirect, AnsiblePluginRemovedError, AnsibleCollectionUnsupportedVersionError
 from ansible.module_utils.common.text.converters import to_bytes, to_text, to_native
+from ansible.module_utils.datatag import deprecator_from_collection_name
 from ansible.module_utils.six import string_types
 from ansible.parsing.yaml.loader import AnsibleLoader
 from ansible._internal._yaml._loader import AnsibleInstrumentedLoader
@@ -40,7 +41,6 @@ from . import _AnsiblePluginInfoMixin
 from .filter import AnsibleJinja2Filter
 from .test import AnsibleJinja2Test
 from .._internal._plugins import _cache
-from ..module_utils.common.messages import PluginInfo
 
 # TODO: take the packaging dep, or vendor SpecifierSet?
 
@@ -202,7 +202,7 @@ class PluginLoadContext(object):
             msg=warning_text,
             date=removal_date,
             version=removal_version,
-            deprecator=PluginInfo._from_collection_name(collection_name),
+            deprecator=deprecator_from_collection_name(collection_name),
         )
 
         self.deprecated = True
@@ -611,7 +611,7 @@ class PluginLoader:
                     version=removal_version,
                     date=removal_date,
                     removed=True,
-                    deprecator=PluginInfo._from_collection_name(acr.collection),
+                    deprecator=deprecator_from_collection_name(acr.collection),
                 )
                 plugin_load_context.date = removal_date
                 plugin_load_context.version = removal_version
@@ -795,7 +795,7 @@ class PluginLoader:
                 except Exception as ex:
                     plugin_load_context.raw_error_list.append(ex)
 
-                    # DTFIX-RELEASE: can we deprecate/remove these stringified versions?
+                    # DTFIX-FUTURE: can we deprecate/remove these stringified versions?
                     if isinstance(ex, ImportError):
                         plugin_load_context.import_error_list.append(ex)
                     else:
@@ -955,7 +955,7 @@ class PluginLoader:
         redirected_names: list[str] | None = None,
         resolved: str | None = None,
     ) -> None:
-        # DTFIX-RELEASE: clean this up- standardize types, document, split/remove redundant bits
+        # DTFIX-FUTURE: clean this up- standardize types, document, split/remove redundant bits
 
         # set extra info on the module, in case we want it later
         obj._original_path = path
@@ -1396,7 +1396,7 @@ class Jinja2Loader(PluginLoader):
                     msg=warning_text,
                     version=removal_version,
                     date=removal_date,
-                    deprecator=PluginInfo._from_collection_name(acr.collection),
+                    deprecator=deprecator_from_collection_name(acr.collection),
                 )
 
             # check removal
@@ -1412,7 +1412,7 @@ class Jinja2Loader(PluginLoader):
                     version=removal_version,
                     date=removal_date,
                     removed=True,
-                    deprecator=PluginInfo._from_collection_name(acr.collection),
+                    deprecator=deprecator_from_collection_name(acr.collection),
                 )
 
                 raise AnsiblePluginRemovedError(exc_msg)

ansible/plugins/lookup/csvfile.py

@@ -103,76 +103,26 @@ RETURN = """
     elements: str
 """
 
-import codecs
 import csv
 
 from collections.abc import MutableSequence
 
-from ansible.errors import AnsibleError, AnsibleAssertionError
+from ansible.errors import AnsibleError
 from ansible.parsing.splitter import parse_kv
 from ansible.plugins.lookup import LookupBase
-from ansible.module_utils.six import PY2
-from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
-
-
-class CSVRecoder:
-    """
-    Iterator that reads an encoded stream and encodes the input to UTF-8
-    """
-    def __init__(self, f, encoding='utf-8'):
-        self.reader = codecs.getreader(encoding)(f)
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        return next(self.reader).encode("utf-8")
-
-    next = __next__   # For Python 2
-
-
-class CSVReader:
-    """
-    A CSV reader which will iterate over lines in the CSV file "f",
-    which is encoded in the given encoding.
-    """
-
-    def __init__(self, f, dialect=csv.excel, encoding='utf-8', **kwds):
-        if PY2:
-            f = CSVRecoder(f, encoding)
-        else:
-            f = codecs.getreader(encoding)(f)
-
-        self.reader = csv.reader(f, dialect=dialect, **kwds)
-
-    def __next__(self):
-        row = next(self.reader)
-        return [to_text(s) for s in row]
-
-    next = __next__  # For Python 2
-
-    def __iter__(self):
-        return self
 
 
 class LookupModule(LookupBase):
 
     def read_csv(self, filename, key, delimiter, encoding='utf-8', dflt=None, col=1, keycol=0):
-
-        try:
-            f = open(to_bytes(filename), 'rb')
-            creader = CSVReader(f, delimiter=to_native(delimiter), encoding=encoding)
-
-            for row in creader:
-                if len(row) and row[keycol] == key:
+        with open(filename, encoding=encoding) as f:
+            for row in csv.reader(f, dialect=csv.excel, delimiter=delimiter):
+                if row and row[keycol] == key:
                     return row[col]
-        except Exception as e:
-            raise AnsibleError("csvfile: %s" % to_native(e))
 
         return dflt
 
     def run(self, terms, variables=None, **kwargs):
-
         ret = []
 
         self.set_options(var_options=variables, direct=kwargs)
@@ -192,23 +142,19 @@ class LookupModule(LookupBase):
             key = kv['_raw_params']
 
             # parameters override per term using k/v
-            try:
-                reset_params = False
-                for name, value in kv.items():
-                    if name == '_raw_params':
-                        continue
-                    if name not in paramvals:
-                        raise AnsibleAssertionError('%s is not a valid option' % name)
-
-                    self._deprecate_inline_kv()
-                    self.set_option(name, value)
-                    reset_params = True
+            reset_params = False
+            for name, value in kv.items():
+                if name == '_raw_params':
+                    continue
+                if name not in paramvals:
+                    raise ValueError(f'{name!r} is not a valid option')
 
-                if reset_params:
-                    paramvals = self.get_options()
+                self._deprecate_inline_kv()
+                self.set_option(name, value)
+                reset_params = True
 
-            except (ValueError, AssertionError) as e:
-                raise AnsibleError(e)
+            if reset_params:
+                paramvals = self.get_options()
 
             # default is just placeholder for real tab
             if paramvals['delimiter'] == 'TAB':
@@ -218,8 +164,7 @@ class LookupModule(LookupBase):
             var = self.read_csv(lookupfile, key, paramvals['delimiter'], paramvals['encoding'], paramvals['default'], paramvals['col'], paramvals['keycol'])
             if var is not None:
                 if isinstance(var, MutableSequence):
-                    for v in var:
-                        ret.append(v)
+                    ret.extend(var)
                 else:
                     ret.append(var)
 

ansible/plugins/lookup/first_found.py

@@ -149,6 +149,7 @@ from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
 from ansible._internal._templating import _jinja_common
 from ansible._internal._templating import _jinja_plugins
+from ansible import template as _template
 from ansible.utils.path import unfrackpath
 from ansible.utils.display import Display
 from ansible.module_utils.datatag import native_type_name
@@ -222,7 +223,7 @@ class LookupModule(LookupBase):
         return total_search
 
     def run(self, terms: list, variables=None, **kwargs):
-        if (first_marker := _jinja_common.get_first_marker_arg((), kwargs)) is not None:
+        if (first_marker := _template.get_first_marker_arg((), kwargs)) is not None:
             first_marker.trip()
 
         if _jinja_plugins._LookupContext.current().invoked_as_with:

ansible/plugins/shell/__init__.py

@@ -16,6 +16,7 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 from __future__ import annotations
 
+import dataclasses
 import os
 import os.path
 import re
@@ -33,6 +34,13 @@ from ansible.plugins import AnsiblePlugin
 _USER_HOME_PATH_RE = re.compile(r'^~[_.A-Za-z0-9][-_.A-Za-z0-9]*$')
 
 
+@dataclasses.dataclass(frozen=True, kw_only=True, slots=True)
+class _ShellCommand:
+    """Internal type returned by shell subsystems that may require both an execution payload and a command (eg powershell)."""
+    command: str
+    input_data: bytes | None = None
+
+
 class ShellBase(AnsiblePlugin):
     def __init__(self):
 
@@ -121,7 +129,13 @@ class ShellBase(AnsiblePlugin):
         cmd = ['test', '-e', self.quote(path)]
         return ' '.join(cmd)
 
-    def mkdtemp(self, basefile=None, system=False, mode=0o700, tmpdir=None):
+    def mkdtemp(
+        self,
+        basefile: str | None = None,
+        system: bool = False,
+        mode: int = 0o700,
+        tmpdir: str | None = None,
+    ) -> str:
         if not basefile:
             basefile = self.__class__._generate_temp_dir_name()
 
@@ -163,7 +177,31 @@ class ShellBase(AnsiblePlugin):
 
         return cmd
 
-    def expand_user(self, user_home_path, username=''):
+    def _mkdtemp2(
+        self,
+        basefile: str | None = None,
+        system: bool = False,
+        mode: int = 0o700,
+        tmpdir: str | None = None,
+    ) -> _ShellCommand:
+        """Gets command info to create a temporary directory.
+
+        This is an internal API that should not be used publicly.
+
+        :args basefile: The base name of the temporary directory.
+        :args system: If True, create the directory in a system-wide location.
+        :args mode: The permissions mode for the directory.
+        :args tmpdir: The directory in which to create the temporary directory.
+        :returns: The shell command to run to create the temp directory.
+        """
+        cmd = self.mkdtemp(basefile=basefile, system=system, mode=mode, tmpdir=tmpdir)
+        return _ShellCommand(command=cmd, input_data=None)
+
+    def expand_user(
+        self,
+        user_home_path: str,
+        username: str = '',
+    ) -> str:
         """ Return a command to expand tildes in a path
 
         It can be either "~" or "~username". We just ignore $HOME
@@ -184,6 +222,22 @@ class ShellBase(AnsiblePlugin):
 
         return 'echo %s' % user_home_path
 
+    def _expand_user2(
+        self,
+        user_home_path: str,
+        username: str = '',
+    ) -> _ShellCommand:
+        """Gets command to expand user path.
+
+        This is an internal API that should not be used publicly.
+
+        :args user_home_path: The path to expand.
+        :args username: The username to use for expansion.
+        :returns: The shell command to run to get the expanded user path.
+        """
+        cmd = self.expand_user(user_home_path, username=username)
+        return _ShellCommand(command=cmd, input_data=None)
+
     def pwd(self):
         """Return the working directory after connecting"""
         return 'echo %spwd%s' % (self._SHELL_SUB_LEFT, self._SHELL_SUB_RIGHT)

ansible/plugins/shell/powershell.py

@@ -21,9 +21,13 @@ import shlex
 import xml.etree.ElementTree as ET
 import ntpath
 
-from ansible.executor.powershell.module_manifest import _get_powershell_script
+from ansible.executor.powershell.module_manifest import _bootstrap_powershell_script, _get_powershell_script
 from ansible.module_utils.common.text.converters import to_bytes, to_text
-from ansible.plugins.shell import ShellBase
+from ansible.plugins.shell import ShellBase, _ShellCommand
+from ansible.utils.display import Display
+
+
+display = Display()
 
 # This is weird, we are matching on byte sequences that match the utf-16-be
 # matches for '_x(a-fA-F0-9){4}_'. The \x00 and {4} will match the hex sequence
@@ -225,9 +229,15 @@ class ShellModule(ShellBase):
         else:
             return self._encode_script("""Remove-Item '%s' -Force;""" % path)
 
-    def mkdtemp(self, basefile=None, system=False, mode=None, tmpdir=None):
-        # Windows does not have an equivalent for the system temp files, so
-        # the param is ignored
+    def mkdtemp(
+        self,
+        basefile: str | None = None,
+        system: bool = False,
+        mode: int = 0o700,
+        tmpdir: str | None = None,
+    ) -> str:
+        # This is not called in Ansible anymore but it is kept for backwards
+        # compatibility in case other action plugins outside Ansible calls this.
         if not basefile:
             basefile = self.__class__._generate_temp_dir_name()
         basefile = self._escape(self._unquote(basefile))
@@ -241,10 +251,38 @@ class ShellModule(ShellBase):
         """
         return self._encode_script(script.strip())
 
-    def expand_user(self, user_home_path, username=''):
-        # PowerShell only supports "~" (not "~username").  Resolve-Path ~ does
-        # not seem to work remotely, though by default we are always starting
-        # in the user's home directory.
+    def _mkdtemp2(
+        self,
+        basefile: str | None = None,
+        system: bool = False,
+        mode: int = 0o700,
+        tmpdir: str | None = None,
+    ) -> _ShellCommand:
+        # Windows does not have an equivalent for the system temp files, so
+        # the param is ignored
+        if not basefile:
+            basefile = self.__class__._generate_temp_dir_name()
+
+        basefile = self._unquote(basefile)
+        basetmpdir = tmpdir if tmpdir else self.get_option('remote_tmp')
+
+        script, stdin = _bootstrap_powershell_script("powershell_mkdtemp.ps1", {
+            'Directory': basetmpdir,
+            'Name': basefile,
+        })
+
+        return _ShellCommand(
+            command=self._encode_script(script),
+            input_data=stdin,
+        )
+
+    def expand_user(
+        self,
+        user_home_path: str,
+        username: str = '',
+    ) -> str:
+        # This is not called in Ansible anymore but it is kept for backwards
+        # compatibility in case other actions plugins outside Ansible called this.
         user_home_path = self._unquote(user_home_path)
         if user_home_path == '~':
             script = 'Write-Output (Get-Location).Path'
@@ -254,6 +292,21 @@ class ShellModule(ShellBase):
             script = "Write-Output '%s'" % self._escape(user_home_path)
         return self._encode_script(f"{self._CONSOLE_ENCODING}; {script}")
 
+    def _expand_user2(
+        self,
+        user_home_path: str,
+        username: str = '',
+    ) -> _ShellCommand:
+        user_home_path = self._unquote(user_home_path)
+        script, stdin = _bootstrap_powershell_script("powershell_expand_user.ps1", {
+            'Path': user_home_path,
+        })
+
+        return _ShellCommand(
+            command=self._encode_script(script),
+            input_data=stdin,
+        )
+
     def exists(self, path):
         path = self._escape(self._unquote(path))
         script = """
@@ -271,6 +324,10 @@ class ShellModule(ShellBase):
         return self._encode_script(script)
 
     def checksum(self, path, *args, **kwargs):
+        display.deprecated(
+            "The 'ShellModule.checksum' method is deprecated. Use 'ActionBase._execute_remote_stat()' instead.",
+            version="2.23"
+        )
         path = self._escape(self._unquote(path))
         script = """
             If (Test-Path -PathType Leaf '%(path)s')

ansible/plugins/shell/sh.py

@@ -14,6 +14,10 @@ extends_documentation_fragment:
 """
 
 from ansible.plugins.shell import ShellBase
+from ansible.utils.display import Display
+
+
+display = Display()
 
 
 class ShellModule(ShellBase):
@@ -43,6 +47,10 @@ class ShellModule(ShellBase):
     _SHELL_GROUP_RIGHT = ')'
 
     def checksum(self, path, python_interp):
+        display.deprecated(
+            "The 'ShellModule.checksum' method is deprecated. Use 'ActionBase._execute_remote_stat()' instead.",
+            version="2.23"
+        )
         # In the following test, each condition is a check and logical
         # comparison (|| or &&) that sets the rc value.  Every check is run so
         # the last check in the series to fail will be the rc that is returned.
@@ -67,11 +75,7 @@ class ShellModule(ShellBase):
         # "one-liner".
         shell_escaped_path = self.quote(path)
         test = "rc=flag; [ -r %(p)s ] %(shell_or)s rc=2; [ -f %(p)s ] %(shell_or)s rc=1; [ -d %(p)s ] %(shell_and)s rc=3; %(i)s -V 2>/dev/null %(shell_or)s rc=4; [ x\"$rc\" != \"xflag\" ] %(shell_and)s echo \"${rc}  \"%(p)s %(shell_and)s exit 0" % dict(p=shell_escaped_path, i=python_interp, shell_and=self._SHELL_AND, shell_or=self._SHELL_OR)  # NOQA
-        csums = [
-            u"({0} -c 'import hashlib; BLOCKSIZE = 65536; hasher = hashlib.sha1();{2}afile = open(\"'{1}'\", \"rb\"){2}buf = afile.read(BLOCKSIZE){2}while len(buf) > 0:{2}\thasher.update(buf){2}\tbuf = afile.read(BLOCKSIZE){2}afile.close(){2}print(hasher.hexdigest())' 2>/dev/null)".format(python_interp, shell_escaped_path, self._SHELL_EMBEDDED_PY_EOL),  # NOQA  Python > 2.4 (including python3)
-            u"({0} -c 'import sha; BLOCKSIZE = 65536; hasher = sha.sha();{2}afile = open(\"'{1}'\", \"rb\"){2}buf = afile.read(BLOCKSIZE){2}while len(buf) > 0:{2}\thasher.update(buf){2}\tbuf = afile.read(BLOCKSIZE){2}afile.close(){2}print(hasher.hexdigest())' 2>/dev/null)".format(python_interp, shell_escaped_path, self._SHELL_EMBEDDED_PY_EOL),  # NOQA  Python == 2.4
-        ]
+        cmd = "({0} -c 'import hashlib; BLOCKSIZE = 65536; hasher = hashlib.sha1();{2}afile = open(\"'{1}'\", \"rb\"){2}buf = afile.read(BLOCKSIZE){2}while len(buf) > 0:{2}\thasher.update(buf){2}\tbuf = afile.read(BLOCKSIZE){2}afile.close(){2}print(hasher.hexdigest())' 2>/dev/null)".format(python_interp, shell_escaped_path, self._SHELL_EMBEDDED_PY_EOL)  # NOQA
 
-        cmd = (" %s " % self._SHELL_OR).join(csums)
         cmd = "%s; %s %s (echo \'0  \'%s)" % (test, cmd, self._SHELL_OR, shell_escaped_path)
         return cmd