another fix for 82, non-global resolver data for 1.2 (from 0.12.17)0.13.4

3 files changed, 27 insertions, 10 deletions

diff --git a/README.rst b/README.rst
index 1068932..d346e4b 100644
--- a/README.rst
+++ b/README.rst
@@ -18,6 +18,10 @@ ChangeLog
 
 .. should insert NEXT: at the beginning of line for next key
 
+0.13.4 (2016-12-05):
+  - another fxi for issue 82, change to non-global resolver data broke implicit type
+    specification
+
 0.13.3 (2016-12-05):
   - fix for issue 82, deepcopy not working (reported by code monk)
 
diff --git a/__init__.py b/__init__.py
index 24fd648..508e2a2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -9,7 +9,7 @@ from __future__ import absolute_import
 
 _package_data = dict(
     full_package_name="ruamel.yaml",
-    version_info=(0, 13, 4, "dev"),
+    version_info=(0, 13, 4),
     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/resolver.py b/resolver.py
index 58fd975..9902a29 100644
--- a/resolver.py
+++ b/resolver.py
@@ -106,6 +106,19 @@ class BaseResolver(object):
         self.resolver_prefix_paths = []
 
     @classmethod
+    def add_implicit_resolver_base(cls, tag, regexp, first):
+        # type: (Any, Any, Any) -> None
+        if 'yaml_implicit_resolvers' not in cls.__dict__:
+            # deepcopy doesn't work here
+            cls.yaml_implicit_resolvers = dict((k, cls.yaml_implicit_resolvers[k][:])
+                                               for k in cls.yaml_implicit_resolvers)
+        if first is None:
+            first = [None]
+        for ch in first:
+            cls.yaml_implicit_resolvers.setdefault(ch, []).append(
+                (tag, regexp))
+
+    @classmethod
     def add_implicit_resolver(cls, tag, regexp, first):
         # type: (Any, Any, Any) -> None
         if 'yaml_implicit_resolvers' not in cls.__dict__:
@@ -113,11 +126,11 @@ class BaseResolver(object):
             cls.yaml_implicit_resolvers = dict((k, cls.yaml_implicit_resolvers[k][:])
                                                for k in cls.yaml_implicit_resolvers)
         if first is None:
-            implicit_resolvers.append(([(1, 2), (1, 1)], tag, regexp, first))
             first = [None]
         for ch in first:
             cls.yaml_implicit_resolvers.setdefault(ch, []).append(
                 (tag, regexp))
+        implicit_resolvers.append(([(1, 2), (1, 1)], tag, regexp, first))
 
     # @classmethod
     # def add_implicit_resolver(cls, tag, regexp, first):
@@ -262,14 +275,14 @@ class BaseResolver(object):
 class Resolver(BaseResolver):
     pass
 
-Resolver.add_implicit_resolver(
+Resolver.add_implicit_resolver_base(
     u'tag:yaml.org,2002:bool',
     re.compile(u'''^(?:yes|Yes|YES|no|No|NO
     |true|True|TRUE|false|False|FALSE
     |on|On|ON|off|Off|OFF)$''', re.X),
     list(u'yYnNtTfFoO'))
 
-Resolver.add_implicit_resolver(
+Resolver.add_implicit_resolver_base(
     u'tag:yaml.org,2002:float',
     re.compile(u'''^(?:
      [-+]?(?:[0-9][0-9_]*)\\.[0-9_]*(?:[eE][-+]?[0-9]+)?
@@ -280,7 +293,7 @@ Resolver.add_implicit_resolver(
     |\\.(?:nan|NaN|NAN))$''', re.X),
     list(u'-+0123456789.'))
 
-Resolver.add_implicit_resolver(
+Resolver.add_implicit_resolver_base(
     u'tag:yaml.org,2002:int',
     re.compile(u'''^(?:[-+]?0b[0-1_]+
     |[-+]?0o?[0-7_]+
@@ -289,19 +302,19 @@ Resolver.add_implicit_resolver(
     |[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+)$''', re.X),
     list(u'-+0123456789'))
 
-Resolver.add_implicit_resolver(
+Resolver.add_implicit_resolver_base(
     u'tag:yaml.org,2002:merge',
     re.compile(u'^(?:<<)$'),
     [u'<'])
 
-Resolver.add_implicit_resolver(
+Resolver.add_implicit_resolver_base(
     u'tag:yaml.org,2002:null',
     re.compile(u'''^(?: ~
     |null|Null|NULL
     | )$''', re.X),
     [u'~', u'n', u'N', u''])
 
-Resolver.add_implicit_resolver(
+Resolver.add_implicit_resolver_base(
     u'tag:yaml.org,2002:timestamp',
     re.compile(u'''^(?:[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]
     |[0-9][0-9][0-9][0-9] -[0-9][0-9]? -[0-9][0-9]?
@@ -310,14 +323,14 @@ Resolver.add_implicit_resolver(
     (?:[ \\t]*(?:Z|[-+][0-9][0-9]?(?::[0-9][0-9])?))?)$''', re.X),
     list(u'0123456789'))
 
-Resolver.add_implicit_resolver(
+Resolver.add_implicit_resolver_base(
     u'tag:yaml.org,2002:value',
     re.compile(u'^(?:=)$'),
     [u'='])
 
 # The following resolver is only for documentation purposes. It cannot work
 # because plain scalars cannot start with '!', '&', or '*'.
-Resolver.add_implicit_resolver(
+Resolver.add_implicit_resolver_base(
     u'tag:yaml.org,2002:yaml',
     re.compile(u'^(?:!|&|\\*)$'),
     list(u'!&*'))