Merge branch 'housekeeping/98-remove-shim' into 'master'

Remove beta compatibility shim

Closes #98

See merge request python-devs/importlib_metadata!95

Author: jaraco

importlib_metadata/__init__.py

@@ -178,8 +178,7 @@ def from_name(cls, name):
             metadata cannot be found.
         """
         for resolver in cls._discover_resolvers():
-            context = DistributionFinder.Context(name=name)
-            dists = cls._maybe_bind(resolver, context)
+            dists = resolver(DistributionFinder.Context(name=name))
             dist = next(dists, None)
             if dist is not None:
                 return dist
@@ -201,24 +200,10 @@ def discover(cls, **kwargs):
             raise ValueError("cannot accept context and kwargs")
         context = context or DistributionFinder.Context(**kwargs)
         return itertools.chain.from_iterable(
-            cls._maybe_bind(resolver, context)
+            resolver(context)
             for resolver in cls._discover_resolvers()
             )
 
-    @staticmethod
-    def _maybe_bind(resolver, context):
-        """
-        Only bind the context to the resolver if as a callable,
-        the resolver accepts the context parameter.
-
-        Workaround for
-        https://gitlab.com/python-devs/importlib_metadata/issues/86
-        """
-        try:  # pragma: nocover
-            return resolver(context)
-        except TypeError:  # pragma: nocover
-            return resolver(name=context.name, path=context.path)
-
     @staticmethod
     def at(path):
         """Return a Distribution for the indicated metadata path

importlib_metadata/docs/changelog.rst

@@ -4,6 +4,9 @@
 
 v1.0.0
 ======
+
+* Removed compatibility shim introduced in 0.23.
+
 * For better compatibility with the stdlib implementation and to
   avoid the same distributions being discovered by the stdlib and
   backport implementations, the backport now disables the