intermediate changes

ref:0f1112f409b3a8b3cf7107febb5eed05d12311bb

2 files changed, 13 insertions, 1 deletions

diff --git a/build/rules/go/vendor.policy b/build/rules/go/vendor.policy
index c3704ecba5..3e9c0acada 100644
--- a/build/rules/go/vendor.policy
+++ b/build/rules/go/vendor.policy
@@ -4,6 +4,9 @@
 
 ALLOW vendor/ -> .*
 
+# CONTRIB-2451
+ALLOW .* -> vendor/github.com/deepmap/oapi-codegen
+
 # CONTRIB-2311 gossip discovery protocol implementation
 ALLOW .* -> vendor/github.com/hashicorp/memberlist
 
diff --git a/library/python/pytest/rewrite.py b/library/python/pytest/rewrite.py
index ec188d847f..4cebcb1edd 100644
--- a/library/python/pytest/rewrite.py
+++ b/library/python/pytest/rewrite.py
@@ -10,6 +10,12 @@ try:
     import importlib.util
 except ImportError:
     pass
+
+try:
+    from pathlib import Path
+except ImportError:
+    pass
+
 from __res import importer
 import sys
 import six
@@ -43,7 +49,10 @@ class AssertionRewritingHook(rewrite.AssertionRewritingHook):
         except ImportError:
             return None
 
-        self._rewritten_names.add(name)
+        if hasattr(self._rewritten_names, 'add'):
+            self._rewritten_names.add(name)
+        else:
+            self._rewritten_names[name] = Path(path[0])
 
         state.trace("rewriting %s" % name)
         co = _rewrite_test(self.config, name)