Skip to content

Commit

Permalink
Disable universal newlines when reading TOML (#2408)
Browse files Browse the repository at this point in the history
  • Loading branch information
hukkin authored Dec 21, 2021
1 parent c5b458e commit 389e9c2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### _Black_

- Do not accept bare carriage return line endings in pyproject.toml (#2408)
- Improve error message for invalid regular expression (#2678)
- Improve error message when parsing fails during AST safety check by embedding the
underlying SyntaxError (#2693)
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ platformdirs= ">=2"
click = ">=8.0.0"
mypy_extensions = ">=0.4.3"
pathspec = ">=0.8.1"
tomli = ">=0.2.6, <2.0.0"
tomli = ">=1.1.0, <3.0.0"
typed-ast = "==1.4.3"
typing_extensions = {markers = "python_version < '3.10'", version = ">=3.10.0.0"}
black = {editable = true,extras = ["d"],path = "."}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def find_python_files(base: Path) -> List[Path]:
install_requires=[
"click>=7.1.2",
"platformdirs>=2",
"tomli>=0.2.6,<2.0.0",
"tomli>=1.1.0,<3.0.0",
"typed-ast>=1.4.2; python_version < '3.8' and implementation_name == 'cpython'",
"pathspec>=0.9.0, <1",
"dataclasses>=0.6; python_version < '3.7'",
Expand Down
4 changes: 2 additions & 2 deletions src/black/files.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
If parsing fails, will raise a tomli.TOMLDecodeError
"""
with open(path_config, encoding="utf8") as f:
pyproject_toml = tomli.loads(f.read())
with open(path_config, "rb") as f:
pyproject_toml = tomli.load(f)
config = pyproject_toml.get("tool", {}).get("black", {})
return {k.replace("--", "").replace("-", "_"): v for k, v in config.items()}

Expand Down

0 comments on commit 389e9c2

Please sign in to comment.