diff --git a/conf/master b/conf/master index ce2e26872af..77addaf4e95 100644 --- a/conf/master +++ b/conf/master @@ -1272,7 +1272,7 @@ ############################################ # Warning: Failure to set TCP keepalives on the salt-master can result in # not detecting the loss of a minion when the connection is lost or when -# it's host has been terminated without first closing the socket. +# its host has been terminated without first closing the socket. # Salt's Presence System depends on this connection status to know if a minion # is "present". # ZeroMQ now includes support for configuring SO_KEEPALIVE if supported by diff --git a/conf/suse/master b/conf/suse/master index 427dbdf002f..eb58519d1d6 100644 --- a/conf/suse/master +++ b/conf/suse/master @@ -1202,7 +1202,7 @@ syndic_user: salt ############################################ # Warning: Failure to set TCP keepalives on the salt-master can result in # not detecting the loss of a minion when the connection is lost or when -# it's host has been terminated without first closing the socket. +# its host has been terminated without first closing the socket. # Salt's Presence System depends on this connection status to know if a minion # is "present". # ZeroMQ now includes support for configuring SO_KEEPALIVE if supported by diff --git a/doc/_incl/_incl/sls_filename_cant_contain_period.rst b/doc/_incl/_incl/sls_filename_cant_contain_period.rst index 9072ffd83f6..92dbe6ef547 100644 --- a/doc/_incl/_incl/sls_filename_cant_contain_period.rst +++ b/doc/_incl/_incl/sls_filename_cant_contain_period.rst @@ -8,5 +8,5 @@ to the directory/file webserver_1/0.sls The same applies for any subdirectories, this is especially 'tricky' when - git repos are created. Another command that typically can't render it's + git repos are created. Another command that typically can't render its output is ```state.show_sls``` of a file in a path that contains a dot. diff --git a/doc/_themes/saltstack/static/js/vendor/jquery-1.9.1.js b/doc/_themes/saltstack/static/js/vendor/jquery-1.9.1.js index 2d8494017ef..9c556f384fd 100644 --- a/doc/_themes/saltstack/static/js/vendor/jquery-1.9.1.js +++ b/doc/_themes/saltstack/static/js/vendor/jquery-1.9.1.js @@ -9456,7 +9456,7 @@ jQuery.fn.extend({ parentOffset = { top: 0, left: 0 }, elem = this[ 0 ]; - // fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent + // fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent if ( jQuery.css( elem, "position" ) === "fixed" ) { // we assume that getBoundingClientRect is available when computed position is fixed offset = elem.getBoundingClientRect(); diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst index 64f94b1b430..3ce679e2095 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -591,8 +591,8 @@ be found by analyzing the cache log with ``memcache_debug`` enabled. Default: ``False`` If cache storage got full, i.e. the items count exceeds the -``memcache_max_items`` value, memcache cleans up it's storage. If this option -set to ``False`` memcache removes the only one oldest value from it's storage. +``memcache_max_items`` value, memcache cleans up its storage. If this option +set to ``False`` memcache removes the only one oldest value from its storage. If this set set to ``True`` memcache removes all the expired items and also removes the oldest one if there are no expired items. @@ -1443,7 +1443,7 @@ This should still be considered a less than secure option, due to the fact that trust is based on just the requesting minion id. .. versionchanged:: 2018.3.0 - For security reasons the file must be readonly except for it's owner. + For security reasons the file must be readonly except for its owner. If :conf_master:`permissive_pki_access` is ``True`` the owning group can also have write access, but if Salt is running as ``root`` it must be a member of that group. A less strict requirement also existed in previous version. @@ -4126,7 +4126,7 @@ branch/tag (or from a per-remote ``env`` parameter), but if set this will override the process of deriving the env from the branch/tag name. For example, in the configuration below the ``foo`` branch would be assigned to the ``base`` environment, while the ``bar`` branch would need to explicitly have ``bar`` -configured as it's environment to keep it from also being mapped to the +configured as its environment to keep it from also being mapped to the ``base`` environment. .. code-block:: yaml diff --git a/doc/ref/configuration/nonroot.rst b/doc/ref/configuration/nonroot.rst index 0b53cb37d82..33c225c21e0 100644 --- a/doc/ref/configuration/nonroot.rst +++ b/doc/ref/configuration/nonroot.rst @@ -21,7 +21,7 @@ As of Salt 0.9.10 it is possible to run Salt as a non-root user. This can be done by setting the :conf_master:`user` parameter in the master configuration file. and restarting the ``salt-master`` service. -The minion has it's own :conf_minion:`user` parameter as well, but running the +The minion has its own :conf_minion:`user` parameter as well, but running the minion as an unprivileged user will keep it from making changes to things like users, installed packages, etc. unless access controls (sudo, etc.) are setup on the minion to permit the non-root user to make the needed changes. diff --git a/doc/ref/executors/index.rst b/doc/ref/executors/index.rst index a7489c90c5a..f72b8076fb5 100644 --- a/doc/ref/executors/index.rst +++ b/doc/ref/executors/index.rst @@ -69,7 +69,7 @@ Where the args are: Dictionary containing the load data including ``executor_opts`` passed via cmdline/API. ``func``, ``args``, ``kwargs``: - Execution module function to be executed and it's arguments. For instance the + Execution module function to be executed and its arguments. For instance the simplest ``direct_call`` executor just runs it as ``func(*args, **kwargs)``. ``Returns``: ``None`` if the execution sequence must be continued with the next executor. diff --git a/doc/topics/cloud/misc.rst b/doc/topics/cloud/misc.rst index 7f716f0226b..80665cf2529 100644 --- a/doc/topics/cloud/misc.rst +++ b/doc/topics/cloud/misc.rst @@ -185,7 +185,7 @@ Connection Timeout ================== There are several stages when deploying Salt where Salt Cloud needs to wait for -something to happen. The VM getting it's IP address, the VM's SSH port is +something to happen. The VM getting its IP address, the VM's SSH port is available, etc. If you find that the Salt Cloud defaults are not enough and your deployment diff --git a/doc/topics/development/contributing.rst b/doc/topics/development/contributing.rst index 4961853d9a2..3c3863426fe 100644 --- a/doc/topics/development/contributing.rst +++ b/doc/topics/development/contributing.rst @@ -411,7 +411,7 @@ root of the Salt repository. Bootstrap Script Changes ------------------------ -Salt's Bootstrap Script, known as `bootstrap-salt.sh`_ in the Salt repo, has it's own +Salt's Bootstrap Script, known as `bootstrap-salt.sh`_ in the Salt repo, has its own repository, contributing guidelines, and release cadence. All changes to the Bootstrap Script should be made to `salt-bootstrap repo`_. Any diff --git a/doc/topics/releases/0.10.3.rst b/doc/topics/releases/0.10.3.rst index a065a608652..14190a68bd1 100644 --- a/doc/topics/releases/0.10.3.rst +++ b/doc/topics/releases/0.10.3.rst @@ -69,7 +69,7 @@ Key Generation -------------- We have reduced the requirements needed for `salt-key` to generate minion keys. -You're no longer required to have salt configured and it's common directories +You're no longer required to have salt configured and its common directories created just to generate keys. This might prove useful if you're batch creating keys to pre-load on minions. diff --git a/doc/topics/releases/2014.1.0.rst b/doc/topics/releases/2014.1.0.rst index 86621ad5a2a..58a93f032af 100644 --- a/doc/topics/releases/2014.1.0.rst +++ b/doc/topics/releases/2014.1.0.rst @@ -237,7 +237,7 @@ Virtual Terminal ---------------- Sometimes the subprocess module is not good enough, and, in fact, not even -``askpass`` is. This virtual terminal is still in it's infant childhood, needs +``askpass`` is. This virtual terminal is still in its infant childhood, needs quite some love, and was originally created to replace ``askpass``, but, while developing it, it immediately proved that it could do so much more. It's currently used by salt-cloud when bootstrapping salt on clouds which require diff --git a/doc/topics/releases/2015.5.11.rst b/doc/topics/releases/2015.5.11.rst index 899a2909c58..61d797b6679 100644 --- a/doc/topics/releases/2015.5.11.rst +++ b/doc/topics/releases/2015.5.11.rst @@ -723,7 +723,7 @@ Changelog for v2015.5.10..v2015.5.11 * f49cc75049 Set correct type for master_tops config value -* **ISSUE** `#31614`_: (`frizzby`_) salt.utils.http.query() implementation contradicts it's documentation. decode arg (refs: `#31622`_) +* **ISSUE** `#31614`_: (`frizzby`_) salt.utils.http.query() implementation contradicts its documentation. decode arg (refs: `#31622`_) * **PR** `#31622`_: (`jfindlay`_) doc/topics/tutorials/http: update query decoding docs @ *2016-03-02 18:23:44 UTC* diff --git a/doc/topics/releases/2015.5.3.rst b/doc/topics/releases/2015.5.3.rst index f9a0f89981b..d9da2daeb36 100644 --- a/doc/topics/releases/2015.5.3.rst +++ b/doc/topics/releases/2015.5.3.rst @@ -1599,7 +1599,7 @@ Changelog for v2015.5.2..v2015.5.3 * b93dc5ef6c Linting! - * 2dd5904119 Fixes an issue where Pagerduty states/modules couldn't find it's profile in the Pillar + * 2dd5904119 Fixes an issue where Pagerduty states/modules couldn't find its profile in the Pillar * **PR** `#24366`_: (`terminalmage`_) Use yes $'\\n' instead of printf '\\n' for pecl commands @ *2015-06-03 21:28:58 UTC* diff --git a/doc/topics/releases/2015.8.11.rst b/doc/topics/releases/2015.8.11.rst index 9c68707cfbf..c0cfaa78136 100644 --- a/doc/topics/releases/2015.8.11.rst +++ b/doc/topics/releases/2015.8.11.rst @@ -481,7 +481,7 @@ Changelog for v2015.8.10..v2015.8.11 * b7ac6c735a Moved imports to top, out of _get_moto_version function - * 02f9ba99ba Updated version check. Moved check into it's own function + * 02f9ba99ba Updated version check. Moved check into its own function * d445026c56 Updated test to work with new moto version. Changed strings to unicode diff --git a/doc/topics/releases/2015.8.4.rst b/doc/topics/releases/2015.8.4.rst index 019815d9875..19b6fd6f8ff 100644 --- a/doc/topics/releases/2015.8.4.rst +++ b/doc/topics/releases/2015.8.4.rst @@ -208,12 +208,12 @@ Changelog for v2015.8.3..v2015.8.4 * 5a637420e8 Backport DNF support to 2015.5 branch -* **PR** `#30526`_: (`twangboy`_) Added FlushKey to make sure it's changes are saved to disk +* **PR** `#30526`_: (`twangboy`_) Added FlushKey to make sure its changes are saved to disk @ *2016-01-22 02:33:13 UTC* * e366f6a7fd Merge pull request `#30526`_ from twangboy/reg_flushkey - * 23085ffbbb Added FlushKey to make sure it's changes are saved to disk + * 23085ffbbb Added FlushKey to make sure its changes are saved to disk * **PR** `#30521`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 @ *2016-01-21 23:05:03 UTC* @@ -2990,7 +2990,7 @@ Changelog for v2015.8.3..v2015.8.4 * 7775d65089 Merge pull request `#29178`_ from whytewolf/glance_keystone_profile_fix - * 807dd426a6 Profile not being passed to keystone.endpoint_get in _auth. so if a profiles are being used, then keystone.endpoint_get will not be able to authenticate causing glance to not be able to get it's endpoint. + * 807dd426a6 Profile not being passed to keystone.endpoint_get in _auth. so if a profiles are being used, then keystone.endpoint_get will not be able to authenticate causing glance to not be able to get its endpoint. .. _`#10157`: https://github.com/saltstack/salt/issues/10157 .. _`#11`: https://github.com/saltstack/salt/issues/11 diff --git a/doc/topics/releases/2016.11.9.rst b/doc/topics/releases/2016.11.9.rst index 3a37892c2c0..0658418329d 100644 --- a/doc/topics/releases/2016.11.9.rst +++ b/doc/topics/releases/2016.11.9.rst @@ -642,7 +642,7 @@ Changelog for v2016.11.8..v2016.11.9 * 1b12acd303 Check type before casting - * 03fa37b445 Cast vdata to it's proper type + * 03fa37b445 Cast vdata to its proper type * **PR** `#43863`_: (`nicholasmhughes`_) Atomicfile only copies mode and not user/group perms @ *2017-11-10 18:47:55 UTC* diff --git a/doc/topics/releases/2016.3.2.rst b/doc/topics/releases/2016.3.2.rst index 74d0c00490c..08a3efafe72 100644 --- a/doc/topics/releases/2016.3.2.rst +++ b/doc/topics/releases/2016.3.2.rst @@ -1338,7 +1338,7 @@ Changelog for v2016.3.1..v2016.3.2 * b7ac6c735a Moved imports to top, out of _get_moto_version function - * 02f9ba99ba Updated version check. Moved check into it's own function + * 02f9ba99ba Updated version check. Moved check into its own function * d445026c56 Updated test to work with new moto version. Changed strings to unicode diff --git a/doc/topics/releases/2016.3.5.rst b/doc/topics/releases/2016.3.5.rst index f2b4f7cbbeb..a6053cce54d 100644 --- a/doc/topics/releases/2016.3.5.rst +++ b/doc/topics/releases/2016.3.5.rst @@ -649,7 +649,7 @@ Changelog for v2016.3.4..v2016.3.5 * cdbd2fbe3c Added limit-output to eliminate false packages -* **ISSUE** `#38174`_: (`NickDubelman`_) [syndic] Why can't a syndic node signal when all of it's minions have returned? (refs: `#38279`_) +* **ISSUE** `#38174`_: (`NickDubelman`_) [syndic] Why can't a syndic node signal when all of its minions have returned? (refs: `#38279`_) * **ISSUE** `#32400`_: (`rallytime`_) Document Default Config Values (refs: `#38279`_) diff --git a/doc/topics/releases/2017.7.1.rst b/doc/topics/releases/2017.7.1.rst index ed6a657ebbd..6283d15d8ae 100644 --- a/doc/topics/releases/2017.7.1.rst +++ b/doc/topics/releases/2017.7.1.rst @@ -136,7 +136,7 @@ Changelog for v2017.7.0..v2017.7.1 * 5b99d45f54 Merge pull request `#42473`_ from rallytime/bp-42436 - * 82ed919803 Updating the versions function inside the manage runner to account for when a minion is offline and we are unable to determine it's version. + * 82ed919803 Updating the versions function inside the manage runner to account for when a minion is offline and we are unable to determine its version. * **ISSUE** `#42381`_: (`zebooka`_) Git.detached broken in 2017.7.0 (refs: `#42399`_) diff --git a/doc/topics/releases/2017.7.2.rst b/doc/topics/releases/2017.7.2.rst index 30ddfec4371..df2c287b622 100644 --- a/doc/topics/releases/2017.7.2.rst +++ b/doc/topics/releases/2017.7.2.rst @@ -2041,7 +2041,7 @@ Changelog for v2017.7.1..v2017.7.2 * 09521602c1 Merge pull request `#42436`_ from garethgreenaway/42374_manage_runner_minion_offline - * 0fd39498c0 Updating the versions function inside the manage runner to account for when a minion is offline and we are unable to determine it's version. + * 0fd39498c0 Updating the versions function inside the manage runner to account for when a minion is offline and we are unable to determine its version. * **ISSUE** `#42427`_: (`grichmond-salt`_) Issue Passing Variables created from load_json as Inline Pillar Between States (refs: `#42435`_) diff --git a/doc/topics/releases/2017.7.3.rst b/doc/topics/releases/2017.7.3.rst index dbddfa9649e..815c7ca1a84 100644 --- a/doc/topics/releases/2017.7.3.rst +++ b/doc/topics/releases/2017.7.3.rst @@ -1501,7 +1501,7 @@ Changelog for v2017.7.2..v2017.7.3 * 1b12acd303 Check type before casting - * 03fa37b445 Cast vdata to it's proper type + * 03fa37b445 Cast vdata to its proper type * ed8da2450b Merge pull request `#43863`_ from nicholasmhughes/fix-atomicfile-permission-copy diff --git a/doc/topics/releases/2018.3.3.rst b/doc/topics/releases/2018.3.3.rst index 2f2b271cad5..bafd53a0ce0 100644 --- a/doc/topics/releases/2018.3.3.rst +++ b/doc/topics/releases/2018.3.3.rst @@ -3565,7 +3565,7 @@ Changelog for v2018.3.2..v2018.3.3 * 406efb161e Merge pull request `#48015`_ from garethgreenaway/47546_more_unicode_nonsense - * f457f9cb84 Adding a test to ensure archive.list returns the right results when a tar file contains a file with unicode in it's name. + * f457f9cb84 Adding a test to ensure archive.list returns the right results when a tar file contains a file with unicode in its name. * 9af49bc595 Ensure member names are decoded before adding to various lists. diff --git a/doc/topics/releases/2018.3.4.rst b/doc/topics/releases/2018.3.4.rst index 397ec937589..31087fbac46 100644 --- a/doc/topics/releases/2018.3.4.rst +++ b/doc/topics/releases/2018.3.4.rst @@ -3212,7 +3212,7 @@ Changelog for v2018.3.3..v2018.3.4 * 791e3ff Use dwoz/winrm-fs for chunked downloads - * f3999e1 Move vagrant to it's own group + * f3999e1 Move vagrant to its own group * 0662e37 Merge pull request `#49870`_ from KaiSforza/ci_actually_fail diff --git a/doc/topics/releases/2019.2.1.rst b/doc/topics/releases/2019.2.1.rst index 84ebf457900..a2a79318e6b 100644 --- a/doc/topics/releases/2019.2.1.rst +++ b/doc/topics/releases/2019.2.1.rst @@ -2620,7 +2620,7 @@ Changelog for v2019.2.0..v2019.2.1 * 0372718 Fix lint issues on salt - * 9eab9f4 Add nox session/env/target to run lint against Salt and it's test suite + * 9eab9f4 Add nox session/env/target to run lint against Salt and its test suite * 123f771 Lock lint requirements diff --git a/doc/topics/tutorials/esxi_proxy_minion.rst b/doc/topics/tutorials/esxi_proxy_minion.rst index 3cbe2d847e8..469ed82af02 100644 --- a/doc/topics/tutorials/esxi_proxy_minion.rst +++ b/doc/topics/tutorials/esxi_proxy_minion.rst @@ -57,7 +57,7 @@ Dependencies ============ Manipulation of the ESXi host via a Proxy Minion requires the machine running -the Proxy Minion process to have the ESXCLI package (and all of it's dependencies) +the Proxy Minion process to have the ESXCLI package (and all of its dependencies) and the pyVmomi Python Library to be installed. ESXi Password diff --git a/doc/topics/tutorials/syslog_ng-state-usage.rst b/doc/topics/tutorials/syslog_ng-state-usage.rst index 7d0ca811dcb..cc9450aa66c 100644 --- a/doc/topics/tutorials/syslog_ng-state-usage.rst +++ b/doc/topics/tutorials/syslog_ng-state-usage.rst @@ -138,7 +138,7 @@ The following configuration is an example, how a complete syslog-ng configuratio The :py:func:`syslog_ng.reloaded ` function can generate syslog-ng configuration from YAML. If the statement (source, destination, parser, etc.) has a name, this function uses the id as the name, otherwise (log -statement) it's purpose is like a mandatory comment. +statement) its purpose is like a mandatory comment. After execution this example the syslog\_ng state will generate this file: diff --git a/noxfile.py b/noxfile.py index 96a11c05708..4c6ae27d00b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1005,7 +1005,7 @@ def _lint_pre_commit(session, rcfile, flags, paths): @nox.session(python='3') def lint(session): ''' - Run PyLint against Salt and it's test suite. Set PYLINT_REPORT to a path to capture output. + Run PyLint against Salt and its test suite. Set PYLINT_REPORT to a path to capture output. ''' session.notify('lint-salt-{}'.format(session.python)) session.notify('lint-tests-{}'.format(session.python)) @@ -1029,7 +1029,7 @@ def lint_salt(session): @nox.session(python='3', name='lint-tests') def lint_tests(session): ''' - Run PyLint against Salt and it's test suite. Set PYLINT_REPORT to a path to capture output. + Run PyLint against Salt and its test suite. Set PYLINT_REPORT to a path to capture output. ''' flags = [ '--disable=I' @@ -1059,7 +1059,7 @@ def lint_salt_pre_commit(session): @nox.session(python=False, name='lint-tests-pre-commit') def lint_tests_pre_commit(session): ''' - Run PyLint against Salt and it's test suite. Set PYLINT_REPORT to a path to capture output. + Run PyLint against Salt and its test suite. Set PYLINT_REPORT to a path to capture output. ''' flags = [ '--disable=I' diff --git a/salt/cloud/clouds/vmware.py b/salt/cloud/clouds/vmware.py index f3a9b3c1f04..ff9bbd8a191 100644 --- a/salt/cloud/clouds/vmware.py +++ b/salt/cloud/clouds/vmware.py @@ -3762,7 +3762,7 @@ def create_snapshot(name, kwargs=None, call=None): def revert_to_snapshot(name, kwargs=None, call=None): ''' - Revert virtual machine to it's current snapshot. If no snapshot + Revert virtual machine to its current snapshot. If no snapshot exists, the state of the virtual machine remains unchanged .. note:: diff --git a/salt/cloud/deploy/bootstrap-salt.sh b/salt/cloud/deploy/bootstrap-salt.sh index 3b92520a826..300ca6335c7 100644 --- a/salt/cloud/deploy/bootstrap-salt.sh +++ b/salt/cloud/deploy/bootstrap-salt.sh @@ -1859,7 +1859,7 @@ if [ "$ITYPE" = "git" ]; then if [ "$_POST_NEON_INSTALL" -eq $BS_TRUE ]; then echo - echowarn "Post Neon git based installations will always install salt and it's dependencies using pip" + echowarn "Post Neon git based installations will always install salt and its dependencies using pip" echowarn "You have 10 seconds to cancel and stop the bootstrap process" echo sleep 10 @@ -6922,7 +6922,7 @@ install_macosx_stable_post() { set +o nounset # shellcheck disable=SC1091 . /etc/profile - # Revert nounset to it's previous state + # Revert nounset to its previous state set -o nounset return 0 diff --git a/salt/engines/script.py b/salt/engines/script.py index a88b87bf710..aa61210e949 100644 --- a/salt/engines/script.py +++ b/salt/engines/script.py @@ -64,7 +64,7 @@ def start(cmd, output='json', interval=1): The script engine will scrap stdout of the given script and generate an event based on the - presence of the 'tag' key and it's value. + presence of the 'tag' key and its value. If there is a data obj available, that will also be fired along with the tag. diff --git a/salt/ext/tornado/test/process_test.py b/salt/ext/tornado/test/process_test.py index 3e84b2ffb11..8a478349d0c 100644 --- a/salt/ext/tornado/test/process_test.py +++ b/salt/ext/tornado/test/process_test.py @@ -120,7 +120,7 @@ class ProcessTest(unittest.TestCase): # Now kill them normally so they won't be restarted fetch("/?exit=0", fail_ok=True) - # One process left; watch it's pid change + # One process left; watch its pid change pid = int(fetch("/").body) fetch("/?exit=4", fail_ok=True) pid2 = int(fetch("/").body) diff --git a/salt/minion.py b/salt/minion.py index 6a77d90185b..bc807caa244 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -2668,7 +2668,7 @@ class Minion(MinionBase): def add_periodic_callback(self, name, method, interval=1): ''' - Add a periodic callback to the event loop and call it's start method. + Add a periodic callback to the event loop and call its start method. If a callback by the given name exists this method returns False ''' if name in self.periodic_callbacks: diff --git a/salt/modules/bcache.py b/salt/modules/bcache.py index 7651742a885..f487c745b9f 100644 --- a/salt/modules/bcache.py +++ b/salt/modules/bcache.py @@ -70,7 +70,7 @@ def uuid(dev=None): ''' try: if dev is None: - # take the only directory in /sys/fs/bcache and return it's basename + # take the only directory in /sys/fs/bcache and return its basename return list(salt.utils.path.os_walk('/sys/fs/bcache/'))[0][1][0] else: # basename of the /sys/block/{dev}/bcache/cache symlink target @@ -133,7 +133,7 @@ def detach(dev=None): Detach a backing device(s) from a cache set If no dev is given, all backing devices will be attached. - Detaching a backing device will flush it's write cache. + Detaching a backing device will flush its write cache. This should leave the underlying device in a consistent state, but might take a while. CLI example: @@ -409,7 +409,7 @@ def config_(dev=None, **kwargs): def status(stats=False, config=False, internals=False, superblock=False, alldevs=False): ''' - Show the full status of the BCache system and optionally all it's involved devices + Show the full status of the BCache system and optionally all its involved devices CLI example: diff --git a/salt/modules/boto_ec2.py b/salt/modules/boto_ec2.py index b71effda3d9..27566ffb8b0 100644 --- a/salt/modules/boto_ec2.py +++ b/salt/modules/boto_ec2.py @@ -1805,7 +1805,7 @@ def set_volumes_tags(tag_maps, authoritative=False, dry_run=False, ''' ret = {'success': True, 'comment': '', 'changes': {}} running_states = ('pending', 'rebooting', 'running', 'stopping', 'stopped') - ### First creeate a dictionary mapping all changes for a given volume to it's volume ID... + ### First creeate a dictionary mapping all changes for a given volume to its volume ID... tag_sets = {} for tm in tag_maps: filters = dict(tm.get('filters', {})) diff --git a/salt/modules/cmdmod.py b/salt/modules/cmdmod.py index eed7656a6dd..73d948b68d9 100644 --- a/salt/modules/cmdmod.py +++ b/salt/modules/cmdmod.py @@ -1004,7 +1004,7 @@ def run(cmd, redirection. :param bool bg: If ``True``, run command in background and do not await or - deliver it's results + deliver its results .. versionadded:: 2016.3.0 @@ -2415,7 +2415,7 @@ def script(source, redirection. :param bool bg: If True, run script in background and do not await or - deliver it's results + deliver its results :param dict env: Environment variables to be set prior to execution. @@ -4009,7 +4009,7 @@ def run_bg(cmd, r''' .. versionadded: 2016.3.0 - Execute the passed command in the background and return it's PID + Execute the passed command in the background and return its PID .. note:: diff --git a/salt/modules/glassfish.py b/salt/modules/glassfish.py index f2824a2f67d..1f9c85f30a7 100644 --- a/salt/modules/glassfish.py +++ b/salt/modules/glassfish.py @@ -220,7 +220,7 @@ def _create_element(name, element_type, data, server=None): def _update_element(name, element_type, data, server=None): ''' - Update an element, including it's properties + Update an element, including its properties ''' # Urlencode the name (names may have slashes) name = quote(name, safe='') diff --git a/salt/modules/opkg.py b/salt/modules/opkg.py index 44c27905401..dbf27297b1a 100644 --- a/salt/modules/opkg.py +++ b/salt/modules/opkg.py @@ -124,7 +124,7 @@ def __virtual__(): NILRT_RESTARTCHECK_STATE_PATH, exc.errno, exc.strerror) - # modules.dep always exists, make sure it's restart state files also exist + # modules.dep always exists, make sure its restart state files also exist if not (os.path.exists(os.path.join(NILRT_RESTARTCHECK_STATE_PATH, 'modules.dep.timestamp')) and os.path.exists(os.path.join(NILRT_RESTARTCHECK_STATE_PATH, 'modules.dep.md5sum'))): _update_nilrt_restart_state() diff --git a/salt/modules/publish.py b/salt/modules/publish.py index 1550aa39a8b..8d195c5cc1b 100644 --- a/salt/modules/publish.py +++ b/salt/modules/publish.py @@ -26,7 +26,7 @@ def __virtual__(): def _parse_args(arg): ''' - yamlify `arg` and ensure it's outermost datatype is a list + yamlify `arg` and ensure its outermost datatype is a list ''' yaml_args = salt.utils.args.yamlify_arg(arg) diff --git a/salt/modules/sysfs.py b/salt/modules/sysfs.py index 20f808847ce..b10a8623346 100644 --- a/salt/modules/sysfs.py +++ b/salt/modules/sysfs.py @@ -32,7 +32,7 @@ def __virtual__(): def attr(key, value=None): ''' Access/write a SysFS attribute. - If the attribute is a symlink, it's destination is returned + If the attribute is a symlink, its destination is returned :return: value or bool diff --git a/salt/modules/syslog_ng.py b/salt/modules/syslog_ng.py index cde79f612b1..37d345c4fd3 100644 --- a/salt/modules/syslog_ng.py +++ b/salt/modules/syslog_ng.py @@ -147,7 +147,7 @@ class Buildable(object): def build(self): ''' Builds the textual representation of the whole configuration object - with it's children. + with its children. ''' header = self.build_header() body = self.build_body() @@ -448,7 +448,7 @@ def _get_type_id_options(name, configuration): def _expand_one_key_dictionary(_dict): ''' - Returns the only one key and it's value from a dictionary. + Returns the only one key and its value from a dictionary. ''' key = next(six.iterkeys(_dict)) value = _dict[key] diff --git a/salt/modules/vbox_guest.py b/salt/modules/vbox_guest.py index 6e45b147b45..e5215db0c7b 100644 --- a/salt/modules/vbox_guest.py +++ b/salt/modules/vbox_guest.py @@ -281,7 +281,7 @@ def grant_access_to_shared_folders_to(name, users=None): ''' Grant access to auto-mounted shared folders to the users. - User is specified by it's name. To grant access for several users use argument `users`. + User is specified by its name. To grant access for several users use argument `users`. Access will be denied to the users not listed in `users` argument. See https://www.virtualbox.org/manual/ch04.html#sf_mount_auto for more details. diff --git a/salt/modules/vsphere.py b/salt/modules/vsphere.py index 3d77807820e..c523d2fb94b 100644 --- a/salt/modules/vsphere.py +++ b/salt/modules/vsphere.py @@ -9996,7 +9996,7 @@ def register_vm(name, datacenter, placement, vmx_path, service_instance=None): @gets_service_instance_via_proxy def power_on_vm(name, datacenter=None, service_instance=None): ''' - Powers on a virtual machine specified by it's name. + Powers on a virtual machine specified by its name. name Name of the virtual machine @@ -10038,7 +10038,7 @@ def power_on_vm(name, datacenter=None, service_instance=None): @gets_service_instance_via_proxy def power_off_vm(name, datacenter=None, service_instance=None): ''' - Powers off a virtual machine specified by it's name. + Powers off a virtual machine specified by its name. name Name of the virtual machine diff --git a/salt/modules/win_file.py b/salt/modules/win_file.py index 4fd3eebcdd8..569dd7c88c6 100644 --- a/salt/modules/win_file.py +++ b/salt/modules/win_file.py @@ -1091,7 +1091,7 @@ def remove(path, force=False): else: for name in os.listdir(path): item = '{0}\\{1}'.format(path, name) - # If it's a normal directory, recurse to remove it's contents + # If it's a normal directory, recurse to remove its contents remove(item, force) # rmdir will work now because the directory is empty diff --git a/salt/modules/win_lgpo.py b/salt/modules/win_lgpo.py index 1892fa497f8..07590196d02 100644 --- a/salt/modules/win_lgpo.py +++ b/salt/modules/win_lgpo.py @@ -2654,7 +2654,7 @@ class _policy_info(object): ########## LEGACY AUDIT POLICIES ########## # To use these set the following policy to DISABLED # "Audit: Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings" - # or it's alias... + # or its alias... # SceNoApplyLegacyAuditPolicy 'AuditAccountLogon': { 'Policy': 'Audit account logon events', @@ -2753,7 +2753,7 @@ class _policy_info(object): # "Audit: Force audit policy subcategory settings (Windows # Vista or later) to override audit policy category # settings" - # or it's alias... + # or its alias... # SceNoApplyLegacyAuditPolicy # Account Logon Section @@ -6607,7 +6607,7 @@ def _checkAllAdmxPolicies(policy_class, # Make sure the we're passing the full policy name # This issue was found when setting the `Allow Telemetry` setting # All following states would show a change in this setting - # When the state does it's first `lgpo.get` it would return `AllowTelemetry` + # When the state does its first `lgpo.get` it would return `AllowTelemetry` # On the second run, it would return `Allow Telemetry` # This makes sure we're always returning the full_name when required if this_policyname in policy_vals[this_policynamespace][this_policyname]: @@ -8367,7 +8367,7 @@ def _get_policy_adm_setting(admx_policy, # Make sure the we're passing the full policy name # This issue was found when setting the `Allow Telemetry` setting # All following states would show a change in this setting - # When the state does it's first `lgpo.get` it would return `AllowTelemetry` + # When the state does its first `lgpo.get` it would return `AllowTelemetry` # On the second run, it would return `Allow Telemetry` # This makes sure we're always returning the full_name when required if this_policy_name in policy_vals[this_policy_namespace][this_policy_name]: diff --git a/salt/modules/win_task.py b/salt/modules/win_task.py index 2e97ef94f28..7a61953a4a0 100644 --- a/salt/modules/win_task.py +++ b/salt/modules/win_task.py @@ -225,7 +225,7 @@ def _get_date_value(date): def _reverse_lookup(dictionary, value): ''' - Lookup the key in a dictionary by it's value. Will return the first match. + Lookup the key in a dictionary by its value. Will return the first match. :param dict dictionary: The dictionary to search diff --git a/salt/modules/win_useradd.py b/salt/modules/win_useradd.py index b3bf93b5616..f96cfb49b16 100644 --- a/salt/modules/win_useradd.py +++ b/salt/modules/win_useradd.py @@ -126,7 +126,7 @@ def add(name, directory. Must be the Drive Letter followed by a colon. ie: U: profile (str, optional): An explicit path to a profile. Can be a UNC or - a folder on the system. If left blank, windows uses it's default + a folder on the system. If left blank, windows uses its default profile directory. logonscript (str, optional): Path to a login script to run when the user diff --git a/salt/netapi/rest_cherrypy/tools/websockets.py b/salt/netapi/rest_cherrypy/tools/websockets.py index b918c48e1fe..941a9fb40e0 100644 --- a/salt/netapi/rest_cherrypy/tools/websockets.py +++ b/salt/netapi/rest_cherrypy/tools/websockets.py @@ -16,7 +16,7 @@ class SynchronizingWebsocket(WebSocket): Class to handle requests sent to this websocket connection. Each instance of this class represents a Salt websocket connection. Waits to receive a ``ready`` message from the client. - Calls send on it's end of the pipe to signal to the sender on receipt + Calls send on its end of the pipe to signal to the sender on receipt of ``ready``. This class also kicks off initial information probing jobs when clients diff --git a/salt/payload.py b/salt/payload.py index 37397a66727..b51385fd63f 100644 --- a/salt/payload.py +++ b/salt/payload.py @@ -186,7 +186,7 @@ class Serial(object): return tuple(obj) elif isinstance(obj, CaseInsensitiveDict): return dict(obj) - # Nothing known exceptions found. Let msgpack raise it's own. + # Nothing known exceptions found. Let msgpack raise its own. return obj try: diff --git a/salt/proxy/fx2.py b/salt/proxy/fx2.py index 6143025eb68..f6d96f6d3f0 100644 --- a/salt/proxy/fx2.py +++ b/salt/proxy/fx2.py @@ -152,7 +152,7 @@ you could run functions from this module on any host where an appropriate version of ``racadm`` is installed, and that host would reach out over the network and communicate with the chassis. -``Chassis.cmd`` acts as a "shim" between the execution module and the proxy. It's +``Chassis.cmd`` acts as a "shim" between the execution module and the proxy. Its first parameter is always the function from salt.modules.dracr to execute. If the function takes more positional or keyword arguments you can append them to the call. It's this shim that speaks to the chassis through the proxy, arranging for the diff --git a/salt/renderers/pydsl.py b/salt/renderers/pydsl.py index aa042ecb624..2242135bcdd 100644 --- a/salt/renderers/pydsl.py +++ b/salt/renderers/pydsl.py @@ -349,7 +349,7 @@ __all__ = ['render'] def render(template, saltenv='base', sls='', tmplpath=None, rendered_sls=None, **kws): sls = salt.utils.stringutils.to_str(sls) mod = types.ModuleType(sls) - # Note: mod object is transient. It's existence only lasts as long as + # Note: mod object is transient. Its existence only lasts as long as # the lowstate data structure that the highstate in the sls file # is compiled to. diff --git a/salt/runners/jobs.py b/salt/runners/jobs.py index 2178adb4897..59e15f7bfad 100644 --- a/salt/runners/jobs.py +++ b/salt/runners/jobs.py @@ -420,7 +420,7 @@ def list_jobs_filter(count, def print_job(jid, ext_source=None): ''' - Print a specific job's detail given by it's jid, including the return data. + Print a specific job's detail given by its jid, including the return data. CLI Example: diff --git a/salt/runners/state.py b/salt/runners/state.py index e7e61ec4da4..cc3eb50f1ba 100644 --- a/salt/runners/state.py +++ b/salt/runners/state.py @@ -217,7 +217,7 @@ def orchestrate_show_sls(mods, Display the state data from a specific sls, or list of sls files, after being render using the master minion. - Note, the master minion adds a "_master" suffix to it's minion id. + Note, the master minion adds a "_master" suffix to its minion id. .. seealso:: The state.show_sls module function diff --git a/salt/states/boto_sns.py b/salt/states/boto_sns.py index efdd03f8aca..154e766fc3c 100644 --- a/salt/states/boto_sns.py +++ b/salt/states/boto_sns.py @@ -165,7 +165,7 @@ def present( '****') if subscription not in _subscriptions: - # Ensure the endpoint is set back to it's original value, + # Ensure the endpoint is set back to its original value, # incase we starred out a password subscription['endpoint'] = _endpoint diff --git a/salt/states/boto_vpc.py b/salt/states/boto_vpc.py index 3e8830c8a03..dc0338344eb 100644 --- a/salt/states/boto_vpc.py +++ b/salt/states/boto_vpc.py @@ -387,7 +387,7 @@ def dhcp_options_present(name, dhcp_options_id=None, vpc_name=None, vpc_id=None, # boto provides no "update_dhcp_options()" functionality, and you can't delete it if # it's attached, and you can't detach it if it's the only one, so just check if it's - # there or not, and make no effort to validate it's actual settings... :( + # there or not, and make no effort to validate its actual settings... :( ### TODO - add support for multiple sets of DHCP options, and then for "swapping out" ### sets by creating new, mapping, then deleting the old. r = __salt__['boto_vpc.dhcp_options_exists'](dhcp_options_id=dhcp_options_id, diff --git a/salt/states/esxi.py b/salt/states/esxi.py index 8728224716d..f836939ea0f 100644 --- a/salt/states/esxi.py +++ b/salt/states/esxi.py @@ -901,7 +901,7 @@ def syslog_configured(name, After a successful parameter set, reset the service. Defaults to ``True``. reset_syslog_config - Resets the syslog service to it's default settings. Defaults to ``False``. + Resets the syslog service to its default settings. Defaults to ``False``. If set to ``True``, default settings defined by the list of syslog configs in ``reset_configs`` will be reset before running any other syslog settings. diff --git a/salt/states/esxvm.py b/salt/states/esxvm.py index 7c940860092..0a1501d318e 100644 --- a/salt/states/esxvm.py +++ b/salt/states/esxvm.py @@ -133,7 +133,7 @@ Creates a virtual machine with a given configuration. vm_registered ------------- -Registers a virtual machine with it's configuration file path. +Registers a virtual machine with its configuration file path. Dependencies ============ diff --git a/salt/states/glassfish.py b/salt/states/glassfish.py index 813f1e84a49..12edf698f30 100644 --- a/salt/states/glassfish.py +++ b/salt/states/glassfish.py @@ -3,7 +3,7 @@ Manage Glassfish/Payara server .. versionadded:: Carbon -Management of glassfish using it's RESTful API +Management of glassfish using its RESTful API You can setup connection parameters like this .. code-block:: yaml diff --git a/salt/states/pip_state.py b/salt/states/pip_state.py index 0f762752d02..a10469f717e 100644 --- a/salt/states/pip_state.py +++ b/salt/states/pip_state.py @@ -44,7 +44,7 @@ import salt.ext.six as six def purge_pip(): ''' - Purge pip and it's sub-modules + Purge pip and its sub-modules ''' # Remove references to the loaded pip module above so reloading works if 'pip' not in sys.modules: diff --git a/salt/states/vbox_guest.py b/salt/states/vbox_guest.py index c5dacb6803a..f11405a9fd1 100644 --- a/salt/states/vbox_guest.py +++ b/salt/states/vbox_guest.py @@ -97,7 +97,7 @@ def grant_access_to_shared_folders_to(name, users=None): ''' Grant access to auto-mounted shared folders to the users. - User is specified by it's name. To grant access for several users use + User is specified by its name. To grant access for several users use argument `users`. name diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py index f8098b3121d..e03aeaa65c7 100644 --- a/salt/transport/zeromq.py +++ b/salt/transport/zeromq.py @@ -815,7 +815,7 @@ def _set_tcp_keepalive(zmq_socket, opts): Warning: Failure to set TCP keepalives on the salt-master can result in not detecting the loss of a minion when the connection is lost or when - it's host has been terminated without first closing the socket. + its host has been terminated without first closing the socket. Salt's Presence System depends on this connection status to know if a minion is "present". diff --git a/salt/utils/dns.py b/salt/utils/dns.py index 963b47f9ec6..5b50fbf6329 100644 --- a/salt/utils/dns.py +++ b/salt/utils/dns.py @@ -665,7 +665,7 @@ def query( ): ''' Query DNS for information. - Where `lookup()` returns record data, `query()` tries to interpret the data and return it's results + Where `lookup()` returns record data, `query()` tries to interpret the data and return its results :param name: name to lookup :param rdtype: DNS record type @@ -1038,7 +1038,7 @@ def service( secure=None ): ''' - Find an SRV service in a domain or it's parents + Find an SRV service in a domain or its parents :param svc: service to find (ldap, 389, etc) :param proto: protocol the service talks (tcp, udp, etc) :param domain: domain to start search in diff --git a/salt/utils/network.py b/salt/utils/network.py index 906d1cb3bce..7702cac18c9 100644 --- a/salt/utils/network.py +++ b/salt/utils/network.py @@ -811,7 +811,7 @@ def _interfaces_ifconfig(out): if iface in ret: # SunOS optimization, where interfaces occur twice in 'ifconfig -a' # output with the same name: for ipv4 and then for ipv6 addr family. - # Every instance has it's own 'UP' status and we assume that ipv4 + # Every instance has its own 'UP' status and we assume that ipv4 # status determines global interface status. # # merge items with higher priority for older values @@ -1018,7 +1018,7 @@ def get_net_start(ipaddr, netmask): def get_net_size(mask): ''' - Turns an IPv4 netmask into it's corresponding prefix length + Turns an IPv4 netmask into its corresponding prefix length (255.255.255.0 -> 24 as in 192.168.1.10/24). ''' binary_str = '' diff --git a/salt/utils/schema.py b/salt/utils/schema.py index f9129b2733e..9372c617d18 100644 --- a/salt/utils/schema.py +++ b/salt/utils/schema.py @@ -442,7 +442,7 @@ class SchemaMeta(six.with_metaclass(Prepareable, type)): # the value is an item instance if hasattr(value, 'title') and value.title is None: # It's an item instance without a title, make the title - # it's name + # its name value.title = key entry_name = value.__item_name__ or key items[entry_name] = value @@ -462,7 +462,7 @@ class SchemaMeta(six.with_metaclass(Prepareable, type)): if flatten is True: # This configuration block is to be treated as a part of the # configuration for which it was defined as an attribute, not as - # it's own sub configuration + # its own sub configuration instance.__flatten__ = True if allow_additional_items is True: # The configuration block only accepts the configuration items @@ -502,7 +502,7 @@ class BaseSchemaItemMeta(six.with_metaclass(Prepareable, type)): attributes.append(argname) except TypeError: # On the base object type, __init__ is just a wrapper which - # triggers a TypeError when we're trying to find out it's + # triggers a TypeError when we're trying to find out its # argspec continue attrs['_attributes'] = attributes @@ -1162,7 +1162,7 @@ class ArrayItem(BaseSchemaItem): def __get_items__(self): if isinstance(self.items, (Schema, SchemaItem)): - # This is either a Schema or a Basetem, return it in it's + # This is either a Schema or a Basetem, return it in its # serialized form return self.items.serialize() if isinstance(self.items, (tuple, list)): diff --git a/salt/utils/thin.py b/salt/utils/thin.py index 8496db9569d..505e747e72a 100644 --- a/salt/utils/thin.py +++ b/salt/utils/thin.py @@ -665,7 +665,7 @@ def gen_min(cachedir, extra_mods='', overwrite=False, so_mods='', else: tops_py_version_mapping['3'] = tops - # TODO: Consider putting known py2 and py3 compatible libs in it's own sharable directory. + # TODO: Consider putting known py2 and py3 compatible libs in its own sharable directory. # This would reduce the min size. if _six.PY2 and sys.version_info[0] == 2: # Get python 3 tops diff --git a/salt/utils/vmware.py b/salt/utils/vmware.py index 92210f48dbf..0187b4e4332 100644 --- a/salt/utils/vmware.py +++ b/salt/utils/vmware.py @@ -3424,7 +3424,7 @@ def convert_to_kb(unit, size): def power_cycle_vm(virtual_machine, action='on'): ''' - Powers on/off a virtual machine specified by it's name. + Powers on/off a virtual machine specified by its name. virtual_machine vim.VirtualMachine object to power on/off virtual machine diff --git a/salt/utils/win_osinfo.py b/salt/utils/win_osinfo.py index c673af3b55f..ad3f2bf8b03 100644 --- a/salt/utils/win_osinfo.py +++ b/salt/utils/win_osinfo.py @@ -88,7 +88,7 @@ def get_join_info(): .. versionadded:: 2018.3.4 Returns: - dict: A dictionary containing the domain/workgroup and it's status + dict: A dictionary containing the domain/workgroup and its status ''' info = win32net.NetGetJoinInformation() status = {win32netcon.NetSetupUnknown: 'Unknown', diff --git a/salt/utils/win_runas.py b/salt/utils/win_runas.py index 8d01af2330c..62bccdac457 100644 --- a/salt/utils/win_runas.py +++ b/salt/utils/win_runas.py @@ -200,7 +200,7 @@ def runas(cmdLine, username, password=None, cwd=None): # Resume the process psutil.Process(dwProcessId).resume() - # Wait for the process to exit and get it's return code. + # Wait for the process to exit and get its return code. if win32event.WaitForSingleObject(hProcess, win32event.INFINITE) == win32con.WAIT_OBJECT_0: exitcode = win32process.GetExitCodeProcess(hProcess) ret['retcode'] = exitcode diff --git a/salt/version.py b/salt/version.py index 31150afc264..14942bc281a 100644 --- a/salt/version.py +++ b/salt/version.py @@ -51,7 +51,7 @@ VERSION_LIMIT = MAX_SIZE - 200 # ONLY UPDATE CODENAMES AFTER BRANCHING # # As an example, The Helium codename must only be properly defined with "(2014, 7)" after Hydrogen, "(2014, 1)", has -# been branched out into it's own branch. +# been branched out into its own branch. # # ALL OTHER VERSION INFORMATION IS EXTRACTED FROM THE GIT TAGS # diff --git a/tests/conftest.py b/tests/conftest.py index 4095971b052..c22f64d5a42 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -109,7 +109,7 @@ for handler in logging.root.handlers[:]: logging.root.removeHandler(handler) -# Reset the root logger to it's default level(because salt changed it) +# Reset the root logger to its default level(because salt changed it) logging.root.setLevel(logging.WARNING) log = logging.getLogger('salt.testsuite') diff --git a/tests/integration/proxy/conftest.py b/tests/integration/proxy/conftest.py index e482f046c04..f840fac8fd1 100644 --- a/tests/integration/proxy/conftest.py +++ b/tests/integration/proxy/conftest.py @@ -28,7 +28,7 @@ def session_salt_proxy(request, stats_key = ' Salt Proxy' request.session.stats_processes[stats_key] = psutil.Process(session_salt_proxy.pid) yield session_salt_proxy - # Terminate Proxy now, we want to cleanup it's key before we move along + # Terminate Proxy now, we want to cleanup its key before we move along session_salt_proxy.terminate() del request.session.stats_processes[stats_key] diff --git a/tests/support/cherrypy_testclasses.py b/tests/support/cherrypy_testclasses.py index 37d72ad5d6c..537c610b4e8 100644 --- a/tests/support/cherrypy_testclasses.py +++ b/tests/support/cherrypy_testclasses.py @@ -88,7 +88,7 @@ class BaseRestCherryPyTest(BaseCherryPyTestCase): cherrypy.server.unsubscribe() cherrypy.engine.start() - # Make sure cherrypy does not memleak on it's bus since it keeps + # Make sure cherrypy does not memleak on its bus since it keeps # adding handlers without cleaning the old ones each time we setup # a new application for value in cherrypy.engine.listeners.values(): @@ -134,7 +134,7 @@ if HAS_CHERRYPY: patcher.start() self.addCleanup(patcher.stop) - # Make sure cherrypy does not memleak on it's bus since it keeps + # Make sure cherrypy does not memleak on its bus since it keeps # adding handlers without cleaning the old ones each time we setup # a new application for value in cherrypy.engine.listeners.values(): diff --git a/tests/support/win_installer.py b/tests/support/win_installer.py index 4b979b6d44b..6656cdd4b6e 100644 --- a/tests/support/win_installer.py +++ b/tests/support/win_installer.py @@ -76,7 +76,7 @@ def latest_installer_name(repo=REPO, **kwargs): def download_and_verify(fp, name, repo=REPO): ''' - Download an installer and verify it's contents. + Download an installer and verify its contents. ''' md5 = "{}.md5".format(name) url = lambda x: "{}/{}".format(repo, x) diff --git a/tests/unit/states/test_file.py b/tests/unit/states/test_file.py index b636282a1bd..2ea92a5c276 100644 --- a/tests/unit/states/test_file.py +++ b/tests/unit/states/test_file.py @@ -2184,7 +2184,7 @@ class TestFileState(TestCase, LoaderModuleMockMixin): new_retains = set(generate_fake_files(maxfiles=fake_retain[retainable], every=retain_interval)) # if we generate less than the number of files expected, # then the oldest file will also be retained - # (correctly, since it's the first in it's category) + # (correctly, since it's the first in its category) if fake_retain[retainable] == 'all' or len(new_retains) < fake_retain[retainable]: new_retains.add(fake_file_list[0]) retained_files |= new_retains diff --git a/tests/unit/utils/test_process.py b/tests/unit/utils/test_process.py index 99345a53fb9..17357b08467 100644 --- a/tests/unit/utils/test_process.py +++ b/tests/unit/utils/test_process.py @@ -392,7 +392,7 @@ class TestSignalHandlingProcess(TestCase): ) proc2.start() - # Wait for the sub process to set it's pid + # Wait for the sub process to set its pid while not val.value: time.sleep(.3) @@ -409,7 +409,7 @@ class TestSignalHandlingProcess(TestCase): time.sleep(.3) try: - # Allow some time for the signal handler to do it's thing + # Allow some time for the signal handler to do its thing assert proc.signal_handled() # Reap the signaled process proc.join(1)