python · graingert · Jan 15, 2025 · Jan 15, 2025 · Jan 15, 2025 · Jan 15, 2025
diff --git a/Lib/doctest.py b/Lib/doctest.py
@@ -1,4 +1,3 @@
-# Module doctest.
 # Released to the public domain 16-Jan-2001, by Tim Peters (tim@python.org).
 # Major enhancements and refactoring by:
 #     Jim Fulton
@@ -102,7 +101,8 @@ def _test():
 import sys
 import traceback
 import unittest
-from io import StringIO, IncrementalNewlineDecoder
+import importlib.resources
+from io import StringIO
 from collections import namedtuple
 import _colorize  # Used in doctests
 from _colorize import ANSIColors, can_colorize
@@ -235,25 +235,32 @@ def _normalize_module(module, depth=2):
    else:
        raise TypeError("Expected a module, string, or None")

-def _newline_convert(data):
-    # The IO module provides a handy decoder for universal newline conversion
-    return IncrementalNewlineDecoder(None, True).decode(data, True)
-
 def _load_testfile(filename, package, module_relative, encoding):
    if module_relative:
        package = _normalize_module(package, 3)
+        try:
+            loader = package.__loader__
+        except AttributeError:
+            pass
+        else:
+            if loader is not None:
+                return (
+                    importlib.resources.read_text(package, filename, encoding=encoding),
+                    filename,
+                )
+
+        try:
+            package.__spec__.loader
+        except AttributeError:
+            pass
+        else:
+            return (
+                importlib.resources.read_text(package, filename, encoding=encoding),
+                filename,
+            )
+
        filename = _module_relative_path(package, filename)
-        if (loader := getattr(package, '__loader__', None)) is None:
-            try:
-                loader = package.__spec__.loader
-            except AttributeError:
-                pass
-        if hasattr(loader, 'get_data'):
-            file_contents = loader.get_data(filename)
-            file_contents = file_contents.decode(encoding)
-            # get_data() opens files as 'rb', so one must do the equivalent
-            # conversion as universal newlines would do.
-            return _newline_convert(file_contents), filename
+
    with open(filename, encoding=encoding) as f:
        return f.read(), filename


diff --git a/Misc/NEWS.d/next/Library/2025-01-15-11-57-42.gh-issue-128862.TDHQdR.rst b/Misc/NEWS.d/next/Library/2025-01-15-11-57-42.gh-issue-128862.TDHQdR.rst
@@ -0,0 +1 @@
+Use ``importlib.resources`` to acquire test files in ``doctest``
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Use ``importlib.resources`` to acquire test files in ``doctest``
AA-Turner marked this conversation as resolved. Show resolved Hide resolved