summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Sassoulas <pierre.sassoulas@gmail.com>2021-10-25 14:42:45 +0200
committerPierre Sassoulas <pierre.sassoulas@gmail.com>2021-10-25 21:34:50 +0200
commit367e6c741603fe83a6f7b9e4194911d8e619724d (patch)
tree768cb8b537c208bf4a351719f4fa2abb85011358
parent96b4958aa7455f6849a56d374421cfcb601c587f (diff)
downloadpylint-git-move-env-help-to-the-logical-place.tar.gz
Move the find_pylintrc function in find_default_config_files.pymove-env-help-to-the-logical-place
-rw-r--r--pylint/config/__init__.py14
-rw-r--r--pylint/config/find_default_config_files.py11
2 files changed, 14 insertions, 11 deletions
diff --git a/pylint/config/__init__.py b/pylint/config/__init__.py
index a07bf594a..2e378660f 100644
--- a/pylint/config/__init__.py
+++ b/pylint/config/__init__.py
@@ -41,7 +41,10 @@ import sys
from datetime import datetime
from pylint.config.configuration_mixin import ConfigurationMixIn
-from pylint.config.find_default_config_files import find_default_config_files
+from pylint.config.find_default_config_files import (
+ find_default_config_files,
+ find_pylintrc,
+)
from pylint.config.man_help_formatter import _ManHelpFormatter
from pylint.config.option import Option
from pylint.config.option_manager_mixin import OptionsManagerMixIn
@@ -139,13 +142,4 @@ def save_results(results, base):
print(f"Unable to create file {data_file}: {ex}", file=sys.stderr)
-def find_pylintrc():
- """search the pylint rc file and return its path if it find it, else None"""
- for config_file in find_default_config_files():
- if config_file.endswith("pylintrc"):
- return config_file
-
- return None
-
-
PYLINTRC = find_pylintrc()
diff --git a/pylint/config/find_default_config_files.py b/pylint/config/find_default_config_files.py
index 843aa8648..dd051f9c6 100644
--- a/pylint/config/find_default_config_files.py
+++ b/pylint/config/find_default_config_files.py
@@ -3,6 +3,7 @@
import configparser
import os
+from typing import Iterator, Optional
import toml
from toml import TomlDecodeError
@@ -30,7 +31,7 @@ def _cfg_has_config(path):
return any(section.startswith("pylint.") for section in parser.sections())
-def find_default_config_files():
+def find_default_config_files() -> Iterator[str]:
"""Find all possible config files."""
rc_names = ("pylintrc", ".pylintrc")
config_names = rc_names + ("pyproject.toml", "setup.cfg")
@@ -67,3 +68,11 @@ def find_default_config_files():
if os.path.isfile("/etc/pylintrc"):
yield "/etc/pylintrc"
+
+
+def find_pylintrc() -> Optional[str]:
+ """search the pylint rc file and return its path if it find it, else None"""
+ for config_file in find_default_config_files():
+ if config_file.endswith("pylintrc"):
+ return config_file
+ return None