Changeset f7e47b5 in mod_gnutls

Timestamp:

Jan 3, 2020, 6:06:54 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

63e4efe

Parents:

0699668

Message:

Override yaml.YAMLObject.from_yaml() instead of adding constructors

The code is simpler this way, and also avoids running PyYAML functions
on module load.

File:

• test/mgstest/tests.py (modified) (4 diffs)

test/mgstest/tests.py

@@ -1 +1 @@
 #!/usr/bin/python3
 
-# Copyright 2019 Fiona Klute
+# Copyright 2019-2020 Fiona Klute
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -106 +106 @@
 
     @classmethod
-    def _from_yaml(cls, loader, node):
+    def from_yaml(cls, loader, node):
         fields = loader.construct_mapping(node)
         conn = cls(**fields)
@@ -230 +230 @@
 
     @classmethod
-    def _from_yaml(cls, loader, node):
+    def from_yaml(cls, loader, node):
         fields = loader.construct_mapping(node)
         req = cls(**fields)
@@ -303 +303 @@
         if 'body' in self.expect:
             self.check_body(body)
-
-
-
-# Override the default constructors. Pyyaml ignores default parameters
-# otherwise.
-yaml.add_constructor('!request', TestRequest._from_yaml, yaml.Loader)
-yaml.add_constructor('!request10', TestReq10._from_yaml, yaml.Loader)
-yaml.add_constructor('!connection', TestConnection._from_yaml, yaml.Loader)