Merge pull request #1956 from posita/posita/fix-1955

Fix Regression - Accommodates black.files.find_pyproject_toml returning None
jorgenschaefer · Jan 13, 2022 · edea332 · edea332
2 parents 9e4382f + 5d3d329
commit edea332
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/elpy/blackutil.py b/elpy/blackutil.py
@@ -55,7 +55,7 @@ def fix_code(code, directory):
         pyproject_path = find_pyproject_toml((directory,))
     else:
         pyproject_path = os.path.join(directory, "pyproject.toml")
-    if toml is not None and os.path.exists(pyproject_path):
+    if toml and pyproject_path and os.path.exists(pyproject_path):
         pyproject_config = toml.load(pyproject_path)
         black_config = pyproject_config.get("tool", {}).get("black", {})
         if "line-length" in black_config: