summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/whatsnew/3.10.rst2
-rw-r--r--Lib/importlib/metadata/__init__.py10
-rw-r--r--Misc/NEWS.d/next/Library/2021-06-19-21-52-27.bpo-44464.U2oa-a.rst2
3 files changed, 4 insertions, 10 deletions
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index 6b6578b..7ed80fb 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -1084,7 +1084,7 @@ and will be incorrect in some rare cases, including some ``_``-s in
importlib.metadata
------------------
-Feature parity with ``importlib_metadata`` 4.4
+Feature parity with ``importlib_metadata`` 4.6
(`history <https://importlib-metadata.readthedocs.io/en/latest/history.html>`_).
:ref:`importlib.metadata entry points <entry-points>`
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
index d2116cf..f5172ee 100644
--- a/Lib/importlib/metadata/__init__.py
+++ b/Lib/importlib/metadata/__init__.py
@@ -362,14 +362,6 @@ class EntryPoints(DeprecatedList):
)
-def flake8_bypass(func):
- # defer inspect import as performance optimization.
- import inspect
-
- is_flake8 = any('flake8' in str(frame.filename) for frame in inspect.stack()[:5])
- return func if not is_flake8 else lambda: None
-
-
class Deprecated:
"""
Compatibility add-in for mapping to indicate that
@@ -405,7 +397,7 @@ class Deprecated:
return super().__getitem__(name)
def get(self, name, default=None):
- flake8_bypass(self._warn)()
+ self._warn()
return super().get(name, default)
def __iter__(self):
diff --git a/Misc/NEWS.d/next/Library/2021-06-19-21-52-27.bpo-44464.U2oa-a.rst b/Misc/NEWS.d/next/Library/2021-06-19-21-52-27.bpo-44464.U2oa-a.rst
new file mode 100644
index 0000000..6b1c107
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-06-19-21-52-27.bpo-44464.U2oa-a.rst
@@ -0,0 +1,2 @@
+Remove exception for flake8 in deprecated importlib.metadata interfaces.
+Sync with importlib_metadata 4.6.