summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthon van der Neut <anthon@mnt.org>2018-07-26 23:30:35 +0200
committerAnthon van der Neut <anthon@mnt.org>2018-07-26 23:30:35 +0200
commit9c73729c2a911cb6dbd375d752c422d53b11a251 (patch)
treecebdd6ea809fd3e7913e71d0ff26509a44640b5f
parent1b63538a35c6aeac66095b85b61651a05cdf3b39 (diff)
parent894a94e5d2eaf32e02f0ad982062bcd876b572c9 (diff)
downloadruamel.yaml-9c73729c2a911cb6dbd375d752c422d53b11a251.tar.gz
This merges PR 34 and fixes issue #2110.15.45
-rw-r--r--CHANGES10
-rw-r--r--README.rst9
-rw-r--r--__init__.py4
-rw-r--r--_test/test_api_change.py2
-rw-r--r--main.py2
5 files changed, 21 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index 0f934f7..dbc6877 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+[0, 15, 45]: 2018-07-26
+ - After adding failing test for ``YAML.load_all(Path())``, remove StopIteration
+ (PR provided by `Zachary Buhman <https://bitbucket.org/buhman/>`__,
+ also reported by `Steven Hiscocks <https://bitbucket.org/sdhiscocks/>`__.
+
+[0, 15, 45]: 2018-07-26
+ - After adding failing test for ``YAML.load_all(Path())``, remove StopIteration
+ (PR provided by `Zachary Buhman <https://bitbucket.org/buhman/>`__,
+ also reported by `Steven Hiscocks <https://bitbucket.org/sdhiscocks/>`__.
+
[0, 15, 44]: 2018-07-14
- Correct loading plain scalars consisting of numerals only and
starting with `0`, when not explicitly specifying YAML version
diff --git a/README.rst b/README.rst
index 50b9521..3e0cb4c 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.44
-:updated: 2018-07-14
+:version: 0.15.45
+:updated: 2018-07-26
:documentation: http://yaml.readthedocs.io
:repository: https://bitbucket.org/ruamel/
:pypi: https://pypi.org/project/ruamel.yaml/
@@ -42,6 +42,11 @@ ChangeLog
.. should insert NEXT: at the beginning of line for next key (with empty line)
+0.15.45 (2018-07-26):
+ - After adding failing test for ``YAML.load_all(Path())``, remove StopIteration
+ (PR provided by `Zachary Buhman <https://bitbucket.org/buhman/>`__,
+ also reported by `Steven Hiscocks <https://bitbucket.org/sdhiscocks/>`__.
+
0.15.44 (2018-07-14):
- Correct loading plain scalars consisting of numerals only and
starting with `0`, when not explicitly specifying YAML version
diff --git a/__init__.py b/__init__.py
index 3012415..16bce19 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, 44),
- __version__='0.15.44',
+ version_info=(0, 15, 45),
+ __version__='0.15.45',
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
diff --git a/_test/test_api_change.py b/_test/test_api_change.py
index 7209ae2..65789f4 100644
--- a/_test/test_api_change.py
+++ b/_test/test_api_change.py
@@ -117,7 +117,7 @@ class TestLoadAll:
def test_multi_document_load(self, tmpdir):
"""this went wrong on 3.7 because of StopIteration, PR 37 and Issue 211"""
fn = Path(str(tmpdir)) / 'test.yaml'
- fn.write_text(textwrap.dedent("""\
+ fn.write_text(textwrap.dedent(u"""\
---
- a
---
diff --git a/main.py b/main.py
index 46ffc14..b2bd808 100644
--- a/main.py
+++ b/main.py
@@ -285,7 +285,7 @@ class YAML(object):
with stream.open('r') as fp: # type: ignore
for d in self.load_all(fp, _kw=enforce):
yield d
- raise StopIteration()
+ return
# if skip is None:
# skip = []
# elif isinstance(skip, int):