From 76b0f89d8fcbf88616f62c01551731cc043f86a3 Mon Sep 17 00:00:00 2001 From: Anthon van der Neut Date: Fri, 21 Sep 2018 20:39:48 +0200 Subject: fix #233 fix #231 reverting to subclass dict resp list for CommentedMap/Seq had to reimplement round-trippable mappings with merge-keys to get both JSON dumping and casting using dict(**some_commented_map) to work. (JSON dump of merge maps not tested) *When this change indeed resolves your problem, please **Close** this issue*. *(You can do so using the WorkFlow pull-down (close to the top right of this page))* --- __init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '__init__.py') diff --git a/__init__.py b/__init__.py index 16bfa0c..6ffb2d4 100644 --- a/__init__.py +++ b/__init__.py @@ -7,8 +7,8 @@ if False: # MYPY _package_data = dict( full_package_name='ruamel.yaml', - version_info=(0, 15, 69), - __version__='0.15.69', + version_info=(0, 15, 70), + __version__='0.15.70', author='Anthon van der Neut', author_email='a.van.der.neut@ruamel.eu', description='ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order', # NOQA -- cgit v1.2.1