Remove deprecated zipimport.zipimporter.load_module

Author: Wulian233

Doc/deprecations/pending-removal-in-future.rst

@@ -155,6 +155,3 @@ although there is currently no date scheduled for their removal.
  :class:`~xml.etree.ElementTree.Element` is deprecated. In a future release it
  will always return ``True``. Prefer explicit ``len(elem)`` or
  ``elem is not None`` tests instead.
-
-* :meth:`zipimport.zipimporter.load_module` is deprecated:
- use :meth:`~zipimport.zipimporter.exec_module` instead.

Doc/library/zipimport.rst

@@ -142,17 +142,6 @@ zipimporter Objects
  :exc:`ZipImportError` if the module couldn't be found.
 
 
- .. method:: load_module(fullname)
-
- Load the module specified by *fullname*. *fullname* must be the fully
- qualified (dotted) module name. Returns the imported module on success,
- raises :exc:`ZipImportError` on failure.
-
- .. deprecated:: 3.10
-
- Use :meth:`exec_module` instead.
-
-
  .. method:: invalidate_caches()
 
  Clear out the internal cache of information about files found within

Doc/whatsnew/3.14.rst

@@ -612,6 +612,14 @@ urllib
  It had previously raised a :exc:`DeprecationWarning` since Python 3.11.
  (Contributed by Nikita Sobolev in :gh:`118827`.)
 
+zipimport
+------
+
+* Remove deprecated :meth:`!zipimport.zipimporter.load_module`. It had
+ previously raised a :exc:`DeprecationWarning` since Python 3.10.
+ Use :meth:`~zipimport.zipimporter.exec_module` instead.
+ (Contributed by Jiahao Li in :gh:`125746`.)
+
 Others
 ------
 

Lib/test/test_zipimport.py

@@ -556,13 +556,6 @@ def testZipImporterMethods(self):
  self.assertEqual(zi.archive, TEMP_ZIP)
  self.assertTrue(zi.is_package(TESTPACK))
 
- # PEP 302
- with warnings.catch_warnings():
- warnings.simplefilter("ignore", DeprecationWarning)
-
- mod = zi.load_module(TESTPACK)
- self.assertEqual(zi.get_filename(TESTPACK), mod.__file__)
-
  # PEP 451
  spec = zi.find_spec('spam')
  self.assertIsNotNone(spec)
@@ -675,11 +668,6 @@ def testZipImporterMethodsInSubDirectory(self):
  self.assertEqual(zi.archive, TEMP_ZIP)
  self.assertEqual(zi.prefix, packdir)
  self.assertTrue(zi.is_package(TESTPACK2))
- # PEP 302
- with warnings.catch_warnings():
- warnings.simplefilter("ignore", DeprecationWarning)
- mod = zi.load_module(TESTPACK2)
- self.assertEqual(zi.get_filename(TESTPACK2), mod.__file__)
  # PEP 451
  spec = zi.find_spec(TESTPACK2)
  mod = importlib.util.module_from_spec(spec)
@@ -1069,9 +1057,6 @@ def _testBogusZipFile(self):
  z = zipimport.zipimporter(TESTMOD)
 
  try:
- with warnings.catch_warnings():
- warnings.simplefilter("ignore", DeprecationWarning)
- self.assertRaises(TypeError, z.load_module, None)
  self.assertRaises(TypeError, z.find_module, None)
  self.assertRaises(TypeError, z.find_spec, None)
  self.assertRaises(TypeError, z.exec_module, None)
@@ -1083,9 +1068,6 @@ def _testBogusZipFile(self):
  error = zipimport.ZipImportError
  self.assertIsNone(z.find_spec('abc'))
 
- with warnings.catch_warnings():
- warnings.simplefilter("ignore", DeprecationWarning)
- self.assertRaises(error, z.load_module, 'abc')
  self.assertRaises(error, z.get_code, 'abc')
  self.assertRaises(OSError, z.get_data, 'abc')
  self.assertRaises(error, z.get_source, 'abc')

Lib/zipimport.py

@@ -20,7 +20,6 @@
 import marshal # for loads
 import sys # for modules
 import time # for mktime
-import _warnings # For warn()
 
 __all__ = ['ZipImportError', 'zipimporter']
 
@@ -211,50 +210,6 @@ def is_package(self, fullname):
  return mi
 
 
- # Load and return the module named by 'fullname'.
- def load_module(self, fullname):
- """load_module(fullname) -> module.
-
- Load the module specified by 'fullname'. 'fullname' must be the
- fully qualified (dotted) module name. It returns the imported
- module, or raises ZipImportError if it could not be imported.
-
- Deprecated since Python 3.10. Use exec_module() instead.
- """
- msg = ("zipimport.zipimporter.load_module() is deprecated and slated for "
- "removal in Python 3.12; use exec_module() instead")
- _warnings.warn(msg, DeprecationWarning)
- code, ispackage, modpath = _get_module_code(self, fullname)
- mod = sys.modules.get(fullname)
- if mod is None or not isinstance(mod, _module_type):
- mod = _module_type(fullname)
- sys.modules[fullname] = mod
- mod.__loader__ = self
-
- try:
- if ispackage:
- # add __path__ to the module *before* the code gets
- # executed
- path = _get_module_path(self, fullname)
- fullpath = _bootstrap_external._path_join(self.archive, path)
- mod.__path__ = [fullpath]
-
- if not hasattr(mod, '__builtins__'):
- mod.__builtins__ = __builtins__
- _bootstrap_external._fix_up_module(mod.__dict__, fullname, modpath)
- exec(code, mod.__dict__)
- except:
- del sys.modules[fullname]
- raise
-
- try:
- mod = sys.modules[fullname]
- except KeyError:
- raise ImportError(f'Loaded module {fullname!r} not found in sys.modules')
- _bootstrap._verbose_message('import {} # loaded from Zip {}', fullname, modpath)
- return mod
-
-
  def get_resource_reader(self, fullname):
  """Return the ResourceReader for a module in a zip file."""
  from importlib.readers import ZipReader

Misc/NEWS.d/next/Library/2024-10-20-13-01-05.gh-issue-125746.wDLTay.rst

@@ -0,0 +1,3 @@
+Remove deprecated :meth:`!zipimport.zipimporter.load_module`. It had
+previously raised a :exc:`DeprecationWarning` since Python 3.10. Use
+:meth:`~zipimport.zipimporter.exec_module` instead.