mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 00:55:19 +00:00
3184168365
This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size. |
||
---|---|---|
.. | ||
cache_mods | ||
vmware | ||
__init__.py | ||
test_aggregation.py | ||
test_args.py | ||
test_async.py | ||
test_boto.py | ||
test_cache.py | ||
test_cloud.py | ||
test_configcomparer.py | ||
test_context.py | ||
test_decorators.py | ||
test_dictupdate.py | ||
test_disk_cache.py | ||
test_dns.py | ||
test_doc.py | ||
test_docker.py | ||
test_etcd_util.py | ||
test_event.py | ||
test_extend.py | ||
test_filebuffer.py | ||
test_files.py | ||
test_find.py | ||
test_format_call.py | ||
test_gitfs.py | ||
test_http.py | ||
test_immutabletypes.py | ||
test_kwarg_regex.py | ||
test_locales.py | ||
test_mac_utils.py | ||
test_minions.py | ||
test_network.py | ||
test_parsers.py | ||
test_path.py | ||
test_process.py | ||
test_reactor.py | ||
test_rsax931.py | ||
test_runtime_whitespace_regex.py | ||
test_safe_walk.py | ||
test_sanitizers.py | ||
test_schedule.py | ||
test_schema.py | ||
test_stringutils.py | ||
test_systemd.py | ||
test_timeout.py | ||
test_url.py | ||
test_utils.py | ||
test_validate_net.py | ||
test_verify.py | ||
test_versions.py | ||
test_vt.py | ||
test_warnings.py | ||
test_which.py | ||
test_yamlloader.py |