]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] GH-119496: accept UTF-8 BOM in .pth files (GH-119509)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Fri, 24 May 2024 14:52:09 +0000 (16:52 +0200)
committerGitHub <noreply@github.com>
Fri, 24 May 2024 14:52:09 +0000 (14:52 +0000)
`Out-File -Encoding utf8` and similar commands in Windows Powershell 5.1 emit
UTF-8 with a BOM marker, which the regular `utf-8` codec decodes incorrectly.

`utf-8-sig` accepts a BOM, but also works correctly without one.

This change also makes .pth files match the way Python source files are handled.

(cherry picked from commit bf5b6467f8cc06759f3396ab1a8ad64fe7d1db2e)

Co-authored-by: Alyssa Coghlan <ncoghlan@gmail.com>
Co-authored-by: Inada Naoki <songofacandy@gmail.com>
Lib/site.py

index b3a4916161244abfc83882762944225fa72cf7cd..924cfbecec2bf3ad87d84dcbd71a46d00754cd1d 100644 (file)
@@ -185,7 +185,9 @@ def addpackage(sitedir, name, known_paths):
         return
 
     try:
-        pth_content = pth_content.decode()
+        # Accept BOM markers in .pth files as we do in source files
+        # (Windows PowerShell 5.1 makes it hard to emit UTF-8 files without a BOM)
+        pth_content = pth_content.decode("utf-8-sig")
     except UnicodeDecodeError:
         # Fallback to locale encoding for backward compatibility.
         # We will deprecate this fallback in the future.