From 004563465b23a86e8351fe51ad8194a7ddd16d66 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 19 Jan 2023 16:14:25 +0100 Subject: build: Update PyYAML to 5.4.1 --- yaml/lib/yaml/constructor.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'yaml/lib/yaml/constructor.py') diff --git a/yaml/lib/yaml/constructor.py b/yaml/lib/yaml/constructor.py index 794681cb7f..ff4e36828e 100644 --- a/yaml/lib/yaml/constructor.py +++ b/yaml/lib/yaml/constructor.py @@ -38,6 +38,12 @@ class timezone(datetime.tzinfo): def dst(self, dt=None): return datetime.timedelta(0) + def __copy__(self): + return self.__deepcopy__() + + def __deepcopy__(self, memodict={}): + return self.__class__(self.utcoffset()) + __repr__ = __str__ = tzname @@ -722,18 +728,6 @@ FullConstructor.add_multi_constructor( u'tag:yaml.org,2002:python/name:', FullConstructor.construct_python_name) -FullConstructor.add_multi_constructor( - u'tag:yaml.org,2002:python/module:', - FullConstructor.construct_python_module) - -FullConstructor.add_multi_constructor( - u'tag:yaml.org,2002:python/object:', - FullConstructor.construct_python_object) - -FullConstructor.add_multi_constructor( - u'tag:yaml.org,2002:python/object/new:', - FullConstructor.construct_python_object_new) - class UnsafeConstructor(FullConstructor): def find_python_module(self, name, mark): @@ -750,6 +744,18 @@ class UnsafeConstructor(FullConstructor): return super(UnsafeConstructor, self).set_python_instance_state( instance, state, unsafe=True) +UnsafeConstructor.add_multi_constructor( + u'tag:yaml.org,2002:python/module:', + UnsafeConstructor.construct_python_module) + +UnsafeConstructor.add_multi_constructor( + u'tag:yaml.org,2002:python/object:', + UnsafeConstructor.construct_python_object) + +UnsafeConstructor.add_multi_constructor( + u'tag:yaml.org,2002:python/object/new:', + UnsafeConstructor.construct_python_object_new) + UnsafeConstructor.add_multi_constructor( u'tag:yaml.org,2002:python/object/apply:', UnsafeConstructor.construct_python_object_apply) -- cgit v1.2.3