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

ansible/modules/apt_repository.py

@@ -333,8 +333,8 @@ class SourcesList(object):
 
                 try:
                     fd, tmp_path = tempfile.mkstemp(prefix=".%s-" % fn, dir=d)
-                except (OSError, IOError) as e:
-                    self.module.fail_json(msg='Unable to create temp file at "%s" for apt source: %s' % (d, to_native(e)))
+                except OSError as ex:
+                    raise Exception(f'Unable to create temp file at {d!r} for apt source.') from ex
 
                 f = os.fdopen(fd, 'w')
                 for n, valid, enabled, source, comment in sources:
@@ -350,8 +350,8 @@ class SourcesList(object):
 
                     try:
                         f.write(line)
-                    except IOError as ex:
-                        self.module.fail_json(msg="Failed to write to file %s: %s" % (tmp_path, to_native(ex)))
+                    except OSError as ex:
+                        raise Exception(f"Failed to write to file {tmp_path!r}.") from ex
                 if filename in self.files_mapping:
                     # Write to symlink target instead of replacing symlink as a normal file
                     self.module.atomic_move(tmp_path, self.files_mapping[filename])
@@ -507,8 +507,8 @@ class UbuntuSourcesList(SourcesList):
             if os.path.exists(key_file):
                 try:
                     rc, out, err = self.module.run_command([self.gpg_bin, '--list-packets', key_file])
-                except (IOError, OSError) as e:
-                    self.debug("Could check key against file %s: %s" % (key_file, to_native(e)))
+                except OSError as ex:
+                    self.debug(f"Could check key against file {key_file!r}: {ex}")
                     continue
 
                 if key_fingerprint in out:
@@ -557,8 +557,8 @@ class UbuntuSourcesList(SourcesList):
                             with open(keyfile, 'wb') as f:
                                 f.write(stdout)
                             self.module.log('Added repo key "%s" for apt to file "%s"' % (info['signing_key_fingerprint'], keyfile))
-                        except (OSError, IOError) as e:
-                            self.module.fail_json(msg='Unable to add required signing key for%s ', rc=rc, stderr=stderr, error=to_native(e))
+                        except OSError as ex:
+                            self.module.fail_json(msg='Unable to add required signing key.', rc=rc, stderr=stderr, error=str(ex), exception=ex)
 
             # apt source file
             file = file or self._suggest_filename('%s_%s' % (line, self.codename))
@@ -752,9 +752,9 @@ def main():
                     )
                     module.fail_json(msg=msg)
 
-        except (OSError, IOError) as ex:
+        except OSError as ex:
             revert_sources_list(sources_before, sources_after, sourceslist_before)
-            module.fail_json(msg=to_native(ex))
+            raise
 
     module.exit_json(changed=changed, repo=repo, sources_added=sources_added, sources_removed=sources_removed, state=state, diff=diff)
 

ansible/modules/assemble.py

@@ -186,10 +186,10 @@ def cleanup(module, path, result=None):
     if os.path.exists(path):
         try:
             os.remove(path)
-        except (IOError, OSError) as e:
+        except OSError as ex:
             # don't error on possible race conditions, but keep warning
             if result is not None:
-                module.warn('Unable to remove temp file (%s): %s' % (path, to_native(e)))
+                module.error_as_warning(f'Unable to remove temp file {path!r}.', exception=ex)
 
 
 def main():

ansible/modules/async_wrapper.py

@@ -6,7 +6,6 @@
 from __future__ import annotations
 
 
-import errno
 import json
 import shlex
 import shutil
@@ -122,24 +121,14 @@ def _get_interpreter(module_path):
         return head[2:head.index(b'\n')].strip().split(b' ')
 
 
-def _make_temp_dir(path):
-    # TODO: Add checks for permissions on path.
-    try:
-        os.makedirs(path)
-    except OSError as e:
-        if e.errno != errno.EEXIST:
-            raise
-
-
 def jwrite(info):
-
     jobfile = job_path + ".tmp"
     tjob = open(jobfile, "w")
     try:
         tjob.write(json.dumps(info))
-    except (IOError, OSError) as e:
-        notice('failed to write to %s: %s' % (jobfile, str(e)))
-        raise e
+    except OSError as ex:
+        notice(f'failed to write to {jobfile!r}: {ex}')
+        raise
     finally:
         tjob.close()
         os.rename(jobfile, job_path)
@@ -200,7 +189,7 @@ def _run_module(wrapped_cmd, jid):
             result['stderr'] = stderr
         jwrite(result)
 
-    except (OSError, IOError):
+    except OSError:
         e = sys.exc_info()[1]
         result = {
             "failed": True,
@@ -212,7 +201,7 @@ def _run_module(wrapped_cmd, jid):
         result['ansible_job_id'] = jid
         jwrite(result)
 
-    except (ValueError, Exception):
+    except Exception:
         result = {
             "failed": True,
             "cmd": wrapped_cmd,
@@ -257,7 +246,8 @@ def main():
     job_path = os.path.join(jobdir, jid)
 
     try:
-        _make_temp_dir(jobdir)
+        # TODO: Add checks for permissions on path.
+        os.makedirs(jobdir, exist_ok=True)
     except Exception as e:
         end({
             "failed": True,

ansible/modules/command.py

@@ -299,9 +299,9 @@ def main():
 
         try:
             os.chdir(chdir)
-        except (IOError, OSError) as e:
-            r['msg'] = 'Unable to change directory before execution: %s' % to_text(e)
-            module.fail_json(**r)
+        except OSError as ex:
+            r['msg'] = 'Unable to change directory before execution.'
+            module.fail_json(**r, exception=ex)
 
     # check_mode partial support, since it only really works in checking creates/removes
     if module.check_mode:

ansible/modules/copy.py

@@ -522,8 +522,8 @@ def main():
     if os.path.isfile(src):
         try:
             checksum_src = module.sha1(src)
-        except (OSError, IOError) as e:
-            module.warn("Unable to calculate src checksum, assuming change: %s" % to_native(e))
+        except OSError as ex:
+            module.error_as_warning("Unable to calculate src checksum, assuming change.", exception=ex)
         try:
             # Backwards compat only.  This will be None in FIPS mode
             md5sum_src = module.md5(src)
@@ -636,8 +636,8 @@ def main():
                 # at this point we should always have tmp file
                 module.atomic_move(b_mysrc, dest, unsafe_writes=module.params['unsafe_writes'], keep_dest_attrs=not remote_src)
 
-            except (IOError, OSError):
-                module.fail_json(msg=f"Failed to copy {src!r} to {dest!r}.")
+            except OSError as ex:
+                raise Exception(f"Failed to copy {src!r} to {dest!r}.") from ex
         changed = True
 
     # If neither have checksums, both src and dest are directories.

ansible/modules/cron.py

@@ -271,7 +271,7 @@ class CronTab(object):
                 with open(self.b_cron_file, 'rb') as f:
                     self.n_existing = to_native(f.read(), errors='surrogate_or_strict')
                     self.lines = self.n_existing.splitlines()
-            except IOError:
+            except OSError:
                 # cron file does not exist
                 return
             except Exception:

ansible/modules/file.py

@@ -323,11 +323,8 @@ def get_state(path):
             return 'file'
 
         return 'absent'
-    except OSError as e:
-        if e.errno == errno.ENOENT:  # It may already have been removed
-            return 'absent'
-        else:
-            raise
+    except FileNotFoundError:
+        return 'absent'
 
 
 # This should be moved into the common file utilities
@@ -527,12 +524,14 @@ def ensure_absent(path):
             else:
                 try:
                     os.unlink(b_path)
-                except OSError as e:
-                    if e.errno != errno.ENOENT:  # It may already have been removed
-                        module.fail_json(
-                            msg=f"unlinking failed: {to_native(e)}",
-                            path=path
-                        )
+                except FileNotFoundError:
+                    pass
+                except OSError as ex:
+                    module.fail_json(
+                        msg="Unlinking failed.",
+                        path=path,
+                        exception=ex,
+                    )
 
         result.update({'path': path, 'changed': True, 'diff': diff, 'state': 'absent'})
     else:
@@ -560,10 +559,11 @@ def execute_touch(path, follow, timestamps):
         try:
             open(b_path, 'wb').close()
             changed = True
-        except (OSError, IOError) as e:
+        except OSError as ex:
             module.fail_json(
-                msg=f"Error, could not touch target: {to_native(e, nonstring='simplerepr')}",
-                path=path
+                msg="Error, could not touch target.",
+                path=path,
+                exception=ex,
             )
     # Update the attributes on the file
     diff = initial_diff(path, 'touch', prev_state)
@@ -894,9 +894,8 @@ def ensure_hardlink(path, src, follow, force, timestamps):
                     if os.path.exists(b_path):
                         try:
                             os.unlink(b_path)
-                        except OSError as e:
-                            if e.errno != errno.ENOENT:  # It may already have been removed
-                                raise
+                        except FileNotFoundError:
+                            pass
                 os.link(b_src, b_tmppath)
                 os.rename(b_tmppath, b_path)
             except OSError as e:

ansible/modules/find.py

@@ -571,9 +571,9 @@ def main():
 
                     try:
                         st = os.lstat(fsname)
-                    except (IOError, OSError) as e:
-                        module.warn("Skipped entry '%s' due to this access issue: %s\n" % (fsname, to_text(e)))
-                        skipped[fsname] = to_text(e)
+                    except OSError as ex:
+                        module.error_as_warning(f"Skipped entry {fsname!r} due to access issue.", exception=ex)
+                        skipped[fsname] = str(ex)
                         has_warnings = True
                         continue
 

ansible/modules/get_url.py

@@ -436,6 +436,23 @@ def url_get(module, url, dest, use_proxy, last_mod_time, force, timeout=10, head
         module.fail_json(msg="failed to create temporary content file: %s" % to_native(e), elapsed=elapsed)
     f.close()
     rsp.close()
+
+    # Since shutil.copyfileobj() will read from HTTPResponse in chunks, HTTPResponse.read() will not recognize
+    # if the entire content-length of data was not read. We need to do that validation here, unless a 'chunked'
+    # transfer-encoding was used, in which case we will not know content-length because it will not be returned.
+    # But in that case, HTTPResponse will behave correctly and recognize an IncompleteRead.
+
+    is_gzip = info.get('content-encoding') == 'gzip'
+
+    if not module.check_mode and 'content-length' in info:
+        # If data is decompressed, then content-length won't match the amount of data we've read, so skip.
+        if not is_gzip or (is_gzip and not decompress):
+            st = os.stat(tempname)
+            cl = int(info['content-length'])
+            if st.st_size != cl:
+                diff = cl - st.st_size
+                module.fail_json(msg=f'Incomplete read, ({rsp.length=}, {cl=}, {st.st_size=}) failed to read remaining {diff} bytes')
+
     return tempname, info
 
 

ansible/modules/git.py

@@ -357,11 +357,11 @@ def relocate_repo(module, result, repo_dir, old_repo_dir, worktree_dir):
                 dot_git_file.write('gitdir: %s' % repo_dir)
             result['git_dir_before'] = old_repo_dir
             result['git_dir_now'] = repo_dir
-        except (IOError, OSError) as err:
+        except OSError as ex:
             # if we already moved the .git dir, roll it back
             if os.path.exists(repo_dir):
                 shutil.move(repo_dir, old_repo_dir)
-            module.fail_json(msg=u'Unable to move git dir. %s' % to_text(err))
+            raise Exception('Unable to move git dir.') from ex
 
 
 def head_splitter(headfile, remote, module=None, fail_on_error=False):
@@ -439,7 +439,7 @@ def write_ssh_wrapper(module):
             fd, wrapper_path = tempfile.mkstemp(prefix=module.tmpdir + '/')
         else:
             raise OSError
-    except (IOError, OSError):
+    except OSError:
         fd, wrapper_path = tempfile.mkstemp()
 
     # use existing git_ssh/ssh_command, fallback to 'ssh'
@@ -824,13 +824,14 @@ def get_head_branch(git_path, module, dest, remote, bare=False):
     """
     try:
         repo_path = get_repo_path(dest, bare)
-    except (IOError, ValueError) as err:
+    except (OSError, ValueError) as ex:
         # No repo path found
         # ``.git`` file does not have a valid format for detached Git dir.
         module.fail_json(
             msg='Current repo does not have a valid reference to a '
             'separate Git dir or it refers to the invalid path',
-            details=to_text(err),
+            details=str(ex),
+            exception=ex,
         )
     # Read .git/HEAD for the name of the branch.
     # If we're in a detached HEAD state, look up the branch associated with
@@ -1290,13 +1291,14 @@ def main():
                 if not module.check_mode:
                     relocate_repo(module, result, separate_git_dir, repo_path, dest)
                     repo_path = separate_git_dir
-        except (IOError, ValueError) as err:
+        except (OSError, ValueError) as ex:
             # No repo path found
             # ``.git`` file does not have a valid format for detached Git dir.
             module.fail_json(
                 msg='Current repo does not have a valid reference to a '
                 'separate Git dir or it refers to the invalid path',
-                details=to_text(err),
+                details=str(ex),
+                exception=ex,
             )
         gitconfig = os.path.join(repo_path, 'config')
 

ansible/modules/known_hosts.py

@@ -102,7 +102,6 @@ EXAMPLES = r"""
 
 import base64
 import copy
-import errno
 import hashlib
 import hmac
 import os
@@ -169,11 +168,10 @@ def enforce_state(module, params):
     if replace_or_add or found != (state == "present"):
         try:
             inf = open(path, "r")
-        except IOError as e:
-            if e.errno == errno.ENOENT:
-                inf = None
-            else:
-                module.fail_json(msg="Failed to read %s: %s" % (path, str(e)))
+        except FileNotFoundError:
+            inf = None
+        except OSError as ex:
+            raise Exception(f"Failed to read {path!r}.") from ex
         try:
             with tempfile.NamedTemporaryFile(mode='w+', dir=os.path.dirname(path), delete=False) as outf:
                 if inf is not None:
@@ -184,8 +182,8 @@ def enforce_state(module, params):
                     inf.close()
                 if state == 'present':
                     outf.write(key)
-        except (IOError, OSError) as e:
-            module.fail_json(msg="Failed to write to file %s: %s" % (path, to_native(e)))
+        except OSError as ex:
+            raise Exception(f"Failed to write to file {path!r}.") from ex
         else:
             module.atomic_move(outf.name, path)
 
@@ -220,9 +218,8 @@ def sanity_check(module, host, key, sshkeygen):
         try:
             outf.write(key)
             outf.flush()
-        except IOError as e:
-            module.fail_json(msg="Failed to write to temporary file %s: %s" %
-                             (outf.name, to_native(e)))
+        except OSError as ex:
+            raise Exception(f"Failed to write to temporary file {outf.name!r}.") from ex
 
         sshkeygen_command = [sshkeygen, '-F', host, '-f', outf.name]
         rc, stdout, stderr = module.run_command(sshkeygen_command)
@@ -337,9 +334,10 @@ def compute_diff(path, found_line, replace_or_add, state, key):
     }
     try:
         inf = open(path, "r")
-    except IOError as e:
-        if e.errno == errno.ENOENT:
-            diff['before_header'] = '/dev/null'
+    except FileNotFoundError:
+        diff['before_header'] = '/dev/null'
+    except OSError:
+        pass
     else:
         diff['before'] = inf.read()
         inf.close()

ansible/modules/package.py

@@ -85,4 +85,10 @@ EXAMPLES = """
       - httpd
       - mariadb-server
     state: latest
+
+- name: Use the dnf package manager to install httpd
+  ansible.builtin.package:
+    name: httpd
+    state: present
+    use: dnf
 """

ansible/modules/replace.py

@@ -256,8 +256,8 @@ def main():
         try:
             with open(path, 'rb') as f:
                 contents = to_text(f.read(), errors='surrogate_or_strict', encoding=encoding)
-        except (OSError, IOError) as e:
-            module.fail_json(msg='Unable to read the contents of %s: %s' % (path, to_text(e)))
+        except OSError as ex:
+            raise Exception(f"Unable to read the contents of {path!r}.") from ex
 
     pattern = u''
     if params['after'] and params['before']:

ansible/modules/slurp.py

@@ -85,7 +85,6 @@ import base64
 import errno
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_native
 
 
 def main():
@@ -99,20 +98,18 @@ def main():
 
     try:
         with open(source, 'rb') as source_fh:
-            source_content = source_fh.read()
-    except (IOError, OSError) as e:
-        if e.errno == errno.ENOENT:
-            msg = "file not found: %s" % source
-        elif e.errno == errno.EACCES:
-            msg = "file is not readable: %s" % source
-        elif e.errno == errno.EISDIR:
-            msg = "source is a directory and must be a file: %s" % source
+            data = base64.b64encode(source_fh.read())
+    except OSError as ex:
+        if ex.errno == errno.ENOENT:
+            msg = f"File not found: {source}"
+        elif ex.errno == errno.EACCES:
+            msg = f"File is not readable: {source}"
+        elif ex.errno == errno.EISDIR:
+            msg = f"Source is a directory and must be a file: {source}"
         else:
-            msg = "unable to slurp file: %s" % to_native(e, errors='surrogate_then_replace')
+            msg = "Unable to slurp file: {source}"
 
-        module.fail_json(msg)
-
-    data = base64.b64encode(source_content)
+        module.fail_json(msg, exception=ex)
 
     module.exit_json(content=data, source=source, encoding='base64')
 

ansible/modules/stat.py

@@ -354,7 +354,6 @@ stat:
             version_added: 2.3
 """
 
-import errno
 import grp
 import os
 import pwd
@@ -456,12 +455,11 @@ def main():
             st = os.stat(b_path)
         else:
             st = os.lstat(b_path)
-    except OSError as e:
-        if e.errno == errno.ENOENT:
-            output = {'exists': False}
-            module.exit_json(changed=False, stat=output)
-
-        module.fail_json(msg=e.strerror)
+    except FileNotFoundError:
+        output = {'exists': False}
+        module.exit_json(changed=False, stat=output)
+    except OSError as ex:
+        module.fail_json(msg=ex.strerror, exception=ex)
 
     # process base results
     output = format_output(module, path, st)

ansible/modules/unarchive.py

@@ -1132,8 +1132,8 @@ def main():
             res_args['extract_results'] = handler.unarchive()
             if res_args['extract_results']['rc'] != 0:
                 module.fail_json(msg="failed to unpack %s to %s" % (src, dest), **res_args)
-        except IOError:
-            module.fail_json(msg="failed to unpack %s to %s" % (src, dest), **res_args)
+        except OSError as ex:
+            module.fail_json(f"Failed to unpack {src!r} to {dest!r}.", exception=ex, **res_args)
         else:
             res_args['changed'] = True
 
@@ -1150,8 +1150,8 @@ def main():
 
             try:
                 res_args['changed'] = module.set_fs_attributes_if_different(file_args, res_args['changed'], expand=False)
-            except (IOError, OSError) as e:
-                module.fail_json(msg="Unexpected error when accessing exploded file: %s" % to_native(e), **res_args)
+            except OSError as ex:
+                module.fail_json("Unexpected error when accessing exploded file.", exception=ex, **res_args)
 
             if '/' in filename:
                 top_folder_path = filename.split('/')[0]
@@ -1165,8 +1165,8 @@ def main():
                 file_args['path'] = "%s/%s" % (dest, f)
                 try:
                     res_args['changed'] = module.set_fs_attributes_if_different(file_args, res_args['changed'], expand=False)
-                except (IOError, OSError) as e:
-                    module.fail_json(msg="Unexpected error when accessing exploded file: %s" % to_native(e), **res_args)
+                except OSError as ex:
+                    module.fail_json("Unexpected error when accessing exploded file.", exception=ex, **res_args)
 
     if module.params['list_files']:
         res_args['files'] = handler.files_in_archive

ansible/modules/user.py

@@ -1341,7 +1341,7 @@ class User(object):
         try:
             with open(ssh_public_key_file, 'r') as f:
                 ssh_public_key = f.read().strip()
-        except IOError:
+        except OSError:
             return None
         return ssh_public_key
 

ansible/modules/wait_for.py

@@ -380,31 +380,29 @@ class LinuxTCPConnectionInfo(TCPConnectionInfo):
             if not os.path.isfile(self.source_file[family]):
                 continue
             try:
-                f = open(self.source_file[family])
-                for tcp_connection in f.readlines():
-                    tcp_connection = tcp_connection.strip().split()
-                    if tcp_connection[self.local_address_field] == 'local_address':
-                        continue
-                    if (tcp_connection[self.connection_state_field] not in
-                            [get_connection_state_id(_connection_state) for _connection_state in self.module.params['active_connection_states']]):
-                        continue
-                    (local_ip, local_port) = tcp_connection[self.local_address_field].split(':')
-                    if self.port != local_port:
-                        continue
-                    (remote_ip, remote_port) = tcp_connection[self.remote_address_field].split(':')
-                    if (family, remote_ip) in self.exclude_ips:
-                        continue
-                    if any((
-                        (family, local_ip) in self.ips,
-                        (family, self.match_all_ips[family]) in self.ips,
-                        local_ip.startswith(self.ipv4_mapped_ipv6_address['prefix']) and
-                            (family, self.ipv4_mapped_ipv6_address['match_all']) in self.ips,
-                    )):
-                        active_connections += 1
-            except IOError as e:
+                with open(self.source_file[family]) as f:
+                    for tcp_connection in f.readlines():
+                        tcp_connection = tcp_connection.strip().split()
+                        if tcp_connection[self.local_address_field] == 'local_address':
+                            continue
+                        if (tcp_connection[self.connection_state_field] not in
+                                [get_connection_state_id(_connection_state) for _connection_state in self.module.params['active_connection_states']]):
+                            continue
+                        (local_ip, local_port) = tcp_connection[self.local_address_field].split(':')
+                        if self.port != local_port:
+                            continue
+                        (remote_ip, remote_port) = tcp_connection[self.remote_address_field].split(':')
+                        if (family, remote_ip) in self.exclude_ips:
+                            continue
+                        if any((
+                            (family, local_ip) in self.ips,
+                            (family, self.match_all_ips[family]) in self.ips,
+                            local_ip.startswith(self.ipv4_mapped_ipv6_address['prefix']) and
+                                (family, self.ipv4_mapped_ipv6_address['match_all']) in self.ips,
+                        )):
+                            active_connections += 1
+            except OSError:
                 pass
-            finally:
-                f.close()
 
         return active_connections
 
@@ -549,7 +547,7 @@ def main():
                 try:
                     if not os.access(b_path, os.F_OK):
                         break
-                except IOError:
+                except OSError:
                     break
             elif port:
                 try:
@@ -609,7 +607,7 @@ def main():
                                     break
                             except Exception as e:
                                 module.warn('wait_for failed on "%s", unexpected exception(%s): %s.).' % (path, to_native(e.__class__), to_native(e)))
-                    except IOError:
+                    except OSError:
                         pass
             elif port:
                 alt_connect_timeout = math.ceil(
@@ -648,8 +646,8 @@ def main():
                         # Shutdown the client socket
                         try:
                             s.shutdown(socket.SHUT_RDWR)
-                        except socket.error as e:
-                            if e.errno != errno.ENOTCONN:
+                        except OSError as ex:
+                            if ex.errno != errno.ENOTCONN:
                                 raise
                         # else, the server broke the connection on its end, assume it's not ready
                         else:
@@ -661,8 +659,8 @@ def main():
                         # Connection established, success!
                         try:
                             s.shutdown(socket.SHUT_RDWR)
-                        except socket.error as e:
-                            if e.errno != errno.ENOTCONN:
+                        except OSError as ex:
+                            if ex.errno != errno.ENOTCONN:
                                 raise
                         # else, the server broke the connection on its end, assume it's not ready
                         else:

ansible/modules/yum_repository.py

@@ -502,10 +502,11 @@ class YumRepo:
             try:
                 with open(self.dest, 'w') as fd:
                     self.repofile.write(fd)
-            except IOError as e:
+            except OSError as ex:
                 self.module.fail_json(
-                    msg=f"Problems handling file {self.dest}.",
-                    details=to_native(e),
+                    msg=f"Problems handling file {self.dest!r}.",
+                    details=str(ex),
+                    exception=ex,
                 )
         else:
             try: