summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--README.rst8
-rw-r--r--__init__.py6
-rw-r--r--_doc/_static/pypi.svg2
-rw-r--r--scanner.py3
5 files changed, 16 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES
index 9d44f14..fa6ff80 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+[0, 15, 56]: 2018-08-15
+ - fix issue with ``python -O`` optimizing away code (reported, and detailed cause
+ pinpointed, by `Alex Grönholm <https://bitbucket.org/agronholm/>`__
+
[0, 15, 55]: 2018-08-14
- unmade ``CommentedSeq`` a subclass of ``list``. It is now
diff --git a/README.rst b/README.rst
index d6f2e1d..ea80c6a 100644
--- a/README.rst
+++ b/README.rst
@@ -4,8 +4,8 @@ ruamel.yaml
``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python.
-:version: 0.15.55
-:updated: 2018-08-14
+:version: 0.15.56
+:updated: 2018-08-15
:documentation: http://yaml.readthedocs.io
:repository: https://bitbucket.org/ruamel/
:pypi: https://pypi.org/project/ruamel.yaml/
@@ -54,6 +54,10 @@ ChangeLog
.. should insert NEXT: at the beginning of line for next key (with empty line)
+0.15.56 (2018-08-15):
+ - fix issue with ``python -O`` optimizing away code (reported, and detailed cause
+ pinpointed, by `Alex Grönholm <https://bitbucket.org/agronholm/>`__
+
0.15.55 (2018-08-14):
- unmade ``CommentedSeq`` a subclass of ``list``. It is now
indirectly a subclass of the standard
diff --git a/__init__.py b/__init__.py
index 5c994e3..ed2bf5a 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, 55),
- __version__='0.15.55',
+ version_info=(0, 15, 56),
+ __version__='0.15.56',
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
@@ -65,7 +65,7 @@ _package_data = dict(
many_linux='libyaml-devel',
supported=[(2, 7), (3, 4)], # minimum
tox=dict(
- env='*pn', # also test narrow 2.7.15
+ env='*pn', # also test narrow Python 2.7.15 for unicode patterns
deps='ruamel.std.pathlib',
fl8excl='_test/lib',
),
diff --git a/_doc/_static/pypi.svg b/_doc/_static/pypi.svg
index aa24ad4..566fda4 100644
--- a/_doc/_static/pypi.svg
+++ b/_doc/_static/pypi.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="86" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="86" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h33v20H0z"/><path fill="#007ec6" d="M33 0h53v20H33z"/><path fill="url(#b)" d="M0 0h86v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"> <text x="175" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="230">pypi</text><text x="175" y="140" transform="scale(.1)" textLength="230">pypi</text><text x="585" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">0.15.55</text><text x="585" y="140" transform="scale(.1)" textLength="430">0.15.55</text></g> </svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="86" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="86" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h33v20H0z"/><path fill="#007ec6" d="M33 0h53v20H33z"/><path fill="url(#b)" d="M0 0h86v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"> <text x="175" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="230">pypi</text><text x="175" y="140" transform="scale(.1)" textLength="230">pypi</text><text x="585" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">0.15.56</text><text x="585" y="140" transform="scale(.1)" textLength="430">0.15.56</text></g> </svg>
diff --git a/scanner.py b/scanner.py
index 1e26012..0d5885a 100644
--- a/scanner.py
+++ b/scanner.py
@@ -527,7 +527,8 @@ class Scanner(object):
# Reset possible simple key on the current level.
self.remove_possible_simple_key()
# Decrease the flow level.
- assert self.flow_context.pop() == to_pop
+ popped = self.flow_context.pop()
+ assert popped == to_pop
# No simple keys after ']' or '}'.
self.allow_simple_key = False
# Add FLOW-SEQUENCE-END or FLOW-MAPPING-END.