Version 5.25.2release/5.2

5 files changed, 21 insertions, 12 deletions

diff --git a/CHANGES b/CHANGES
index 14069a1..f4a9ae5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,7 @@ For a complete changelog, see:
 * https://github.com/yaml/pyyaml/commits/
 * https://bitbucket.org/xi/pyyaml/commits/
 
-5.2b1 (2019-11-26)
+5.2 (2019-12-02)
 ------------------
 
 * Repair incompatibilities introduced with 5.1. The default Loader was changed,
diff --git a/announcement.msg b/announcement.msg
index 4cf3944..292d0ac 100644
--- a/announcement.msg
+++ b/announcement.msg
@@ -1,22 +1,31 @@
-From: Ingy döt Net <ingy@ingy.net>
+From: Tina Müller <post@tinita.de>
 To: python-list@python.org, python-announce@python.org, yaml-core@lists.sourceforge.net
-Subject: [ANN] PyYAML-5.1.2: YAML parser and emitter for Python
+Subject: [ANN] PyYAML-5.2: YAML parser and emitter for Python
 
 =======================
-Announcing PyYAML-5.1.2
+Announcing PyYAML-5.2
 =======================
 
-A new minor release of PyYAML is now available:
+A new release of PyYAML is now available:
 https://pypi.org/project/PyYAML/
 
-This is a maintenance re-release of PyYAML 5.1 with re-generated Cython
-bindings to allow the extension to build properly for Python 3.8b2+. No code
-changes were made in the PyYAML sources.
+This fixes some incompatibilities introduced in version 5.1 and also removes
+another possibility of loading arbitrary code.
 
 Changes
 =======
 
-* None
+* Repair incompatibilities introduced with 5.1. The default Loader was changed,
+  but several methods like add_constructor still used the old default
+  https://github.com/yaml/pyyaml/pull/279 -- A more flexible fix for custom tag constructors
+  https://github.com/yaml/pyyaml/pull/287 -- Change default loader for yaml.add_constructor
+  https://github.com/yaml/pyyaml/pull/305 -- Change default loader for add_implicit_resolver, add_path_resolver
+* Make FullLoader safer by removing python/object/apply from the default FullLoader
+  https://github.com/yaml/pyyaml/pull/347 -- Move constructor for object/apply to UnsafeConstructor
+* Fix bug introduced in 5.1 where quoting went wrong on systems with sys.maxunicode <= 0xffff
+  https://github.com/yaml/pyyaml/pull/276 -- Fix logic for quoting special characters
+* Other PRs:
+  https://github.com/yaml/pyyaml/pull/280 -- Update CHANGES for 5.1
 
 Resources
 =========
diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py
index 85db1db..32d848e 100644
--- a/lib/yaml/__init__.py
+++ b/lib/yaml/__init__.py
@@ -8,7 +8,7 @@ from nodes import *
 from loader import *
 from dumper import *
 
-__version__ = '5.2b1'
+__version__ = '5.2'
 
 try:
     from cyaml import *
diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py
index 6116109..d9e3ac2 100644
--- a/lib3/yaml/__init__.py
+++ b/lib3/yaml/__init__.py
@@ -8,7 +8,7 @@ from .nodes import *
 from .loader import *
 from .dumper import *
 
-__version__ = '5.2b1'
+__version__ = '5.2'
 try:
     from .cyaml import *
     __with_libyaml__ = True
diff --git a/setup.py b/setup.py
index 8a3e215..8634ef0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 
 NAME = 'PyYAML'
-VERSION = '5.2b1'
+VERSION = '5.2'
 DESCRIPTION = "YAML parser and emitter for Python"
 LONG_DESCRIPTION = """\
 YAML is a data serialization format designed for human readability