feat setuptools: revert/fix UnionProvider

1 files changed, 4 insertions, 5 deletions

diff --git a/contrib/python/setuptools/py3/pkg_resources/__init__.py b/contrib/python/setuptools/py3/pkg_resources/__init__.py
index f2dfebb6dd..8f72b67c27 100644
--- a/contrib/python/setuptools/py3/pkg_resources/__init__.py
+++ b/contrib/python/setuptools/py3/pkg_resources/__init__.py
@@ -3304,11 +3304,7 @@ class UnionProvider(EmptyProvider):
         return False
 
     def _fn(self, base, resource_name):
-        for p, pp in base:
-            if p._has(pp):
-                return p._fn(pp, resource_name)
-
-        raise IOError(resource_name)
+        return [(p, p._fn(pp, resource_name)) for p, pp in base]
 
     def _get(self, path):
         for p, pp in path:
@@ -3334,6 +3330,9 @@ class UnionProvider(EmptyProvider):
 
         return False
 
+    def get_resource_filename(self, manager, resource_name):
+        return self._fn(self.module_path, resource_name)[0]
+
 
 class ResProvider(EmptyProvider):
     _resource_fs = {}