Skip to content
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.

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

Allow our custom yaml dumper to NamespacedDictWrapper objects (2018.3 branch) #49411

Merged
merged 2 commits into from Aug 30, 2018

Conversation

Projects
None yet
3 participants
@terminalmage
Copy link
Contributor

commented Aug 29, 2018

(This is #49408 opened against the 2018.3 branch)

This special dict class did not have a representer assigned to it, so PyYAML would raise an exception when attempting to dump it.

This also removes the class name overriding and deprecates the NamespacedDictWrapper's ability to do so, as it was A) incorrectly implmented and B) is no longer used by anything in Salt.

terminalmage added some commits Aug 29, 2018

Allow our custom yaml dumper to NamespacedDictWrapper objects
This special dict class did not have a representer assigned to it, so
PyYAML would raise an exception when attempting to dump it.

This also removes the name overriding, as its implementation was
ill-conceived and will be deprecated in a later branch (it's only used
in this one place so deprecating should be of no-to-minimal impact).
Remove support for overriding the class name
Nothing in Salt uses this now.

@terminalmage terminalmage requested a review from saltstack/team-core as a code owner Aug 29, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Aug 29, 2018

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Aug 30, 2018

Refs #49269

@rallytime rallytime merged commit a962efc into saltstack:2018.3 Aug 30, 2018

6 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.