diff options
author | Pierre Sassoulas <pierre.sassoulas@gmail.com> | 2020-05-03 14:04:52 +0200 |
---|---|---|
committer | Pierre Sassoulas <pierre.sassoulas@gmail.com> | 2020-05-03 14:40:55 +0200 |
commit | 8403b8961560591810a75f088fb72b8b052665ca (patch) | |
tree | 60a606792c409f1ed4b4b90022d792d4703091cc | |
parent | dc41698cfdbe79386a6b5e0e6d80a578887dc1bf (diff) | |
download | pylint-git-8403b8961560591810a75f088fb72b8b052665ca.tar.gz |
Remove private functions from the API of pylint.config
-rw-r--r-- | pylint/config/__init__.py | 11 | ||||
-rw-r--r-- | tests/unittest_config.py | 12 |
2 files changed, 7 insertions, 16 deletions
diff --git a/pylint/config/__init__.py b/pylint/config/__init__.py index c70aada8c..7f1407d78 100644 --- a/pylint/config/__init__.py +++ b/pylint/config/__init__.py @@ -40,13 +40,7 @@ import sys from pylint.config.configuration_mixin import ConfigurationMixIn from pylint.config.find_default_config_files import find_default_config_files from pylint.config.man_help_formatter import _ManHelpFormatter -from pylint.config.option import ( - Option, - _csv_validator, - _regexp_csv_validator, - _regexp_validator, - _validate, -) +from pylint.config.option import Option from pylint.config.option_manager_mixin import OptionsManagerMixIn from pylint.config.option_parser import OptionParser from pylint.config.options_provider_mixin import OptionsProviderMixIn, UnsupportedAction @@ -54,9 +48,6 @@ from pylint.config.options_provider_mixin import OptionsProviderMixIn, Unsupport __all__ = [ "UnsupportedAction", "ConfigurationMixIn", - "_csv_validator", - "_regexp_csv_validator", - "_regexp_validator", "OptionsManagerMixIn", ] diff --git a/tests/unittest_config.py b/tests/unittest_config.py index 264273750..db517c93b 100644 --- a/tests/unittest_config.py +++ b/tests/unittest_config.py @@ -23,19 +23,19 @@ RE_PATTERN_TYPE = getattr(re, "Pattern", getattr(re, "_pattern_type", None)) def test__regexp_validator_valid(): - result = config._regexp_validator(None, None, "test_.*") + result = config.option._regexp_validator(None, None, "test_.*") assert isinstance(result, RE_PATTERN_TYPE) assert result.pattern == "test_.*" def test__regexp_validator_invalid(): with pytest.raises(sre_constants.error): - config._regexp_validator(None, None, "test_)") + config.option._regexp_validator(None, None, "test_)") def test__csv_validator_no_spaces(): values = ["One", "Two", "Three"] - result = config._csv_validator(None, None, ",".join(values)) + result = config.option._csv_validator(None, None, ",".join(values)) assert isinstance(result, list) assert len(result) == 3 for i, value in enumerate(values): @@ -44,7 +44,7 @@ def test__csv_validator_no_spaces(): def test__csv_validator_spaces(): values = ["One", "Two", "Three"] - result = config._csv_validator(None, None, ", ".join(values)) + result = config.option._csv_validator(None, None, ", ".join(values)) assert isinstance(result, list) assert len(result) == 3 for i, value in enumerate(values): @@ -53,7 +53,7 @@ def test__csv_validator_spaces(): def test__regexp_csv_validator_valid(): pattern_strings = ["test_.*", "foo\\.bar", "^baz$"] - result = config._regexp_csv_validator(None, None, ",".join(pattern_strings)) + result = config.option._regexp_csv_validator(None, None, ",".join(pattern_strings)) for i, regex in enumerate(result): assert isinstance(regex, RE_PATTERN_TYPE) assert regex.pattern == pattern_strings[i] @@ -62,4 +62,4 @@ def test__regexp_csv_validator_valid(): def test__regexp_csv_validator_invalid(): pattern_strings = ["test_.*", "foo\\.bar", "^baz)$"] with pytest.raises(sre_constants.error): - config._regexp_csv_validator(None, None, ",".join(pattern_strings)) + config.option._regexp_csv_validator(None, None, ",".join(pattern_strings)) |