Made .gitignore File Reader Detect Its Encoding

psf · May 13, 2021 · 6c3a7ea · 6c3a7ea
1 parent b0100b5
commit 6c3a7ea
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/black/files.py b/src/black/files.py
@@ -3,6 +3,7 @@
 import os
 from pathlib import Path
 import sys
+import tokenize
 from typing import (
     Any,
     Dict,
@@ -118,8 +119,13 @@ def get_gitignore(root: Path) -> PathSpec:
     gitignore = root / ".gitignore"
     lines: List[str] = []
     if gitignore.is_file():
-        with gitignore.open(encoding="utf-8") as gf:
+        with open(gitignore, "rb") as buf:
+            srcbuf = io.BytesIO(buf.read())
+            encoding, _ = tokenize.detect_encoding(srcbuf.readline)
+            # Detect Encoding
+        with gitignore.open(encoding=encoding) as gf:
             lines = gf.readlines()
+            # Open .gitignore file with detected encoding
     return PathSpec.from_lines("gitwildmatch", lines)