Apr 22, 2023 · Apr 22, 2023
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
        """
        Read installed-files.txt and return lines in a similar
        CSV-parsable format as RECORD: each file must be placed
        relative to the site-packages directory, and must also be
        relative to the site-packages directory and must also be
        quoted (since file names can contain literal commas).

        This file is written when the package is installed by pip,
        but it might not be written for other installation methods.
        Hence, even if we can assume that this file is accurate
        when it exists, we cannot assume that it always exists.
        Assume the file is accurate if it exists.
        """
        text = self.read_text('installed-files.txt')
        #We need to prepend the .egg-info/ subdir to the lines in this file.
        # But this subdir is only availablein thePathDistribution's self._path
        #which is not easily accessible from this base class...
        #Prepend the .egg-info/ subdir to the lines in this file.
        # But this subdir is only availablefromPathDistribution's
        #self._path.
        subdir = getattr(self, '_path', None)
        if not text or not subdir:
            return
        with contextlib.suppress(Exception):
            ret = [
                str((subdir / line).resolve().relative_to(self.locate_file('')))
                for line in text.splitlines()
            ]
            return map('"{}"'.format, ret)

        paths = (
            (subdir / name)
            .resolve()
            .relative_to(self.locate_file('').resolve())
            .as_posix()
            for name in text.splitlines()
        )
        return map('"{}"'.format, paths)

    def _read_files_egginfo_sources(self):
        """
diff --git a/Lib/test/test_importlib/test_metadata_api.py b/Lib/test/test_importlib/test_metadata_api.py
                    expect_content,
                )

    @staticmethod
    def _workaround_103661(tests):
        """
        Skip failing test for now is it's failing on buildbot workers.
        See https://github.com/python/cpython/issues/103661.
        """
        import platform
        if platform.system() == 'Windows':
            tests.remove(('egg_with_no_modules-pkg', '\n'))
        return tests

    def test_read_text(self):
        tests = [
            ('egginfo-pkg', 'mod\n'),
            ('egg_with_no_modules-pkg', '\n'),
        ]
        for pkg_name, expect_content inself._workaround_103661(tests):
        for pkg_name, expect_content in tests:
            with self.subTest(pkg_name):
                top_level = [
                    path for path in files(pkg_name) if path.name == 'top_level.txt'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -516,27 +516,29 @@ def _read_files_egginfo_installed(self):
		"""
		Read installed-files.txt and return lines in a similar
		CSV-parsable format as RECORD: each file must be placed
		relative to the site-packages directory, and must also be
		relative to the site-packages directory and must also be
		quoted (since file names can contain literal commas).

		This file is written when the package is installed by pip,
		but it might not be written for other installation methods.
		Hence, even if we can assume that this file is accurate
		when it exists, we cannot assume that it always exists.
		Assume the file is accurate if it exists.
		"""
		text = self.read_text('installed-files.txt')
		#We need to prepend the .egg-info/ subdir to the lines in this file.
		# But this subdir is only availablein thePathDistribution's self._path
		#which is not easily accessible from this base class...
		#Prepend the .egg-info/ subdir to the lines in this file.
		# But this subdir is only availablefromPathDistribution's
		#self._path.
		subdir = getattr(self, '_path', None)
		if not text or not subdir:
		return
		with contextlib.suppress(Exception):
		ret = [
		str((subdir / line).resolve().relative_to(self.locate_file('')))
		for line in text.splitlines()
		]
		return map('"{}"'.format, ret)

		paths = (
		(subdir / name)
		.resolve()
		.relative_to(self.locate_file('').resolve())
		.as_posix()
		for name in text.splitlines()
		)
		return map('"{}"'.format, paths)

		def _read_files_egginfo_sources(self):
		"""
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,23 +76,12 @@ def test_for_top_level(self):
		expect_content,
		)

		@staticmethod
		def _workaround_103661(tests):
		"""
		Skip failing test for now is it's failing on buildbot workers.
		See https://github.com/python/cpython/issues/103661.
		"""
		import platform
		if platform.system() == 'Windows':
		tests.remove(('egg_with_no_modules-pkg', '\n'))
		return tests

		def test_read_text(self):
		tests = [
		('egginfo-pkg', 'mod\n'),
		('egg_with_no_modules-pkg', '\n'),
		]
		for pkg_name, expect_content inself._workaround_103661(tests):
		for pkg_name, expect_content in tests:
		with self.subTest(pkg_name):
		top_level = [
		path for path in files(pkg_name) if path.name == 'top_level.txt'
Expand Down