Merge "Remove Extension.extras"

This commit is contained in:
Zuul 2023-01-23 16:01:39 +00:00 committed by Gerrit Code Review
commit c4acc5639f
3 changed files with 7 additions and 27 deletions

View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The ``stevedore.extension.Extension`` object no longer exposes an
``extras`` attribute. Entry point extras are a deprecated concept that
aren't useful in the context of stevedore thus the value in exposing this
is minimal to none.

View File

@ -58,29 +58,6 @@ class Extension(object):
match = self.entry_point.pattern.match(self.entry_point.value) match = self.entry_point.pattern.match(self.entry_point.value)
return match.group('module') return match.group('module')
@property
def extras(self):
"""The 'extras' settings for the plugin."""
# NOTE: The underlying package returned re.Match objects until this was
# fixed in importlib-metadata 4.11.3. This was fixed in Python 3.10 and
# backported to Python 3.9.11. For older versions without this fix,
# translate the re.Match objects to the matched strings, which seem
# more useful.
extras = []
for extra in self.entry_point.extras:
if isinstance(extra, str):
# We were previously returning the whole string including
# backets. We need to continue doing so to preserve API
# compatibility.
extras.append(f'[{extra}]')
else:
# Python 3.6 returns _sre.SRE_Match objects. Later
# versions of python return re.Match objects. Both types
# have a 'string' attribute containing the text that
# matched the pattern.
extras.append(getattr(extra, 'string', extra))
return extras
@property @property
def attr(self): def attr(self):
"""The attribute of the module to be loaded.""" """The attribute of the module to be loaded."""

View File

@ -268,10 +268,6 @@ class TestExtensionProperties(utils.TestCase):
self.assertEqual('module.name', self.ext1.module_name) self.assertEqual('module.name', self.ext1.module_name)
self.assertEqual('module', self.ext2.module_name) self.assertEqual('module', self.ext2.module_name)
def test_extras(self):
self.assertEqual(['[extra]'], self.ext1.extras)
self.assertEqual([], self.ext2.extras)
def test_attr(self): def test_attr(self):
self.assertEqual('attribute.name', self.ext1.attr) self.assertEqual('attribute.name', self.ext1.attr)
self.assertEqual('attribute', self.ext2.attr) self.assertEqual('attribute', self.ext2.attr)