Skip to content

Commit a6c186b

Browse files
committed
set regex only for msg
1 parent 3278ca8 commit a6c186b

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

readthedocs/config/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ class InvalidConfig(ConfigError):
110110
message_template = 'Invalid "{key}": {error}'
111111

112112
def __init__(self, key, code, error_message, source_file=None):
113-
self.key = self._get_display_key(key)
113+
self.key = key
114114
self.code = code
115115
self.source_file = source_file
116116
message = self.message_template.format(
117-
key=self.key,
117+
key=self._get_display_key(key),
118118
code=code,
119119
error=error_message,
120120
)

readthedocs/config/tests/test_config.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@ def test_python_install_method_check_invalid(self, value, tmpdir):
10621062
)
10631063
with raises(InvalidConfig) as excinfo:
10641064
build.validate()
1065-
assert excinfo.value.key == 'python.install[0].method'
1065+
assert excinfo.value.key == 'python.install.0.method'
10661066

10671067
def test_python_install_requirements_check_valid(self, tmpdir):
10681068
apply_fs(tmpdir, {'requirements.txt': ''})
@@ -1096,7 +1096,7 @@ def test_python_install_requirements_does_not_allow_null(self, tmpdir):
10961096
)
10971097
with raises(InvalidConfig) as excinfo:
10981098
build.validate()
1099-
assert excinfo.value.key == 'python.install[0].requirements'
1099+
assert excinfo.value.key == 'python.install.0.requirements'
11001100

11011101
def test_python_install_requirements_error_msg(self, tmpdir):
11021102
build = self.get_build_config(
@@ -1129,7 +1129,7 @@ def test_python_install_requirements_does_not_allow_empty_string(self, tmpdir):
11291129
)
11301130
with raises(InvalidConfig) as excinfo:
11311131
build.validate()
1132-
assert excinfo.value.key == 'python.install[0].requirements'
1132+
assert excinfo.value.key == 'python.install.0.requirements'
11331133

11341134
def test_python_install_requirements_ignores_default(self, tmpdir):
11351135
apply_fs(tmpdir, {'requirements.txt': ''})
@@ -1174,7 +1174,7 @@ def test_python_install_requirements_check_invalid_types(self, value, tmpdir):
11741174
)
11751175
with raises(InvalidConfig) as excinfo:
11761176
build.validate()
1177-
assert excinfo.value.key == 'python.install[0].requirements'
1177+
assert excinfo.value.key == 'python.install.0.requirements'
11781178

11791179
def test_python_install_path_is_required(self, tmpdir):
11801180
build = self.get_build_config(
@@ -1324,7 +1324,7 @@ def test_python_install_extra_requirements_and_setuptools(self, tmpdir):
13241324
)
13251325
with raises(InvalidConfig) as excinfo:
13261326
build.validate()
1327-
assert excinfo.value.key == 'python.install[0].extra_requirements'
1327+
assert excinfo.value.key == 'python.install.0.extra_requirements'
13281328

13291329
@pytest.mark.parametrize('value', [2, 'invalid', {}, '', None])
13301330
def test_python_install_extra_requirements_check_type(self, value, tmpdir):
@@ -1342,7 +1342,7 @@ def test_python_install_extra_requirements_check_type(self, value, tmpdir):
13421342
)
13431343
with raises(InvalidConfig) as excinfo:
13441344
build.validate()
1345-
assert excinfo.value.key == 'python.install[0].extra_requirements'
1345+
assert excinfo.value.key == 'python.install.0.extra_requirements'
13461346

13471347
def test_python_install_extra_requirements_allow_empty(self, tmpdir):
13481348
build = self.get_build_config(
@@ -1869,7 +1869,7 @@ def test_submodules_recursive_explicit_default(self):
18691869
}]
18701870
}
18711871
},
1872-
'python.install[1].invalid'
1872+
'python.install.1.invalid'
18731873
)
18741874
])
18751875
def test_strict_validation(self, value, key):

0 commit comments

Comments
 (0)