Skip to content

fix yamlloader.DuplicateKeyWarning leaking #62021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ch3LL merged 7 commits into from
Jun 24, 2022
Merged

fix yamlloader.DuplicateKeyWarning leaking #62021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c0988e4
fix yamlloader.DuplicateKeyWarning leaking
sakateka May 4, 2022
9d13522
add changelog/62021.fixed
sakateka May 4, 2022
c81b0ed
Merge branch 'master' into yamlloader-mem-leak
dmurphy18 Jun 16, 2022
2822e92
Merge branch 'master' into yamlloader-mem-leak
sakateka Jun 17, 2022
a7d1a7a
Merge branch 'master' into yamlloader-mem-leak
sakateka Jun 21, 2022
ba8e335
Merge branch 'master' into yamlloader-mem-leak
dmurphy18 Jun 21, 2022
c737b66
Merge branch 'master' into yamlloader-mem-leak
sakateka Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/62021.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
utils/yamlloader and yamlloader_old: fix leaking DuplicateKeyWarning through a warnings module
11 changes: 0 additions & 11 deletions salt/utils/yamlloader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"""


import warnings

import salt.utils.stringutils
import yaml # pylint: disable=blacklisted-import
from yaml.constructor import ConstructorError
Expand All @@ -17,15 +15,6 @@
__all__ = ["SaltYamlSafeLoader", "load", "safe_load"]


class DuplicateKeyWarning(RuntimeWarning):
"""
Warned when duplicate keys exist
"""


warnings.simplefilter("always", category=DuplicateKeyWarning)


# with code integrated from https://gist.github.com/844388
class SaltYamlSafeLoader(BaseLoader):
"""
Expand Down
10 changes: 0 additions & 10 deletions salt/utils/yamlloader_old.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


import re
import warnings

import salt.utils.stringutils
import yaml # pylint: disable=blacklisted-import
Expand All @@ -21,15 +20,6 @@
__all__ = ["SaltYamlSafeLoader", "load", "safe_load"]


class DuplicateKeyWarning(RuntimeWarning):
"""
Warned when duplicate keys exist
"""


warnings.simplefilter("always", category=DuplicateKeyWarning)


# with code integrated from https://gist.github.com/844388
class SaltYamlSafeLoader(yaml.SafeLoader):
"""
Expand Down