ZODB URI EntryPoints: More 3.8 fixes.

zodb · Jun 28, 2023 · 24a01ca · 24a01ca
1 parent 9087a2b
commit 24a01ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/relstorage/adapters/tests/test_drivers.py b/src/relstorage/adapters/tests/test_drivers.py
@@ -180,7 +180,7 @@ class Driver(drivers.AbstractModuleDriver):
         d.REQUIREMENTS = ( 'relstorage.this.is.not.a.distro',)
         with self.assertRaisesRegex(
             drivers.DriverNotAvailableError,
-            'package metadata'
+            'PackageNotFoundError'
         ):
             d._check_preconditions()
 

diff --git a/src/relstorage/tests/test_zodburi.py b/src/relstorage/tests/test_zodburi.py
@@ -211,7 +211,10 @@ def _check_entry_point(self, name, cls, helper_cls):
             # so we have to look at the entire ``.value``.
             #
             ep_dict = entry_points()
-            entry_point, = (
+            __traceback_info__ = ep_dict
+            # On Python 3.8, we can get duplicate EntryPoint objects; it is unclear
+            # why. Drop them into a set to make sure we only get one.
+            entry_point, = set(
                 ep
                 for ep
                 in ep_dict['zodburi.resolvers']