A single sentance instead of two

Pierre-Sassoulas · Pierre-Sassoulas · commit 6b0df7581647 · 2022-06-03T16:50:46.000+02:00
diff --git a/pylint/message/message_definition_store.py b/pylint/message/message_definition_store.py
@@ -48,10 +48,10 @@ def _kwargs_for_bad_option_value_add_message(
         removal_explanation = self.is_deleted_msgid_or_symbol(msgid)
         if removal_explanation is not None:
             symbol = "useless-option-value"
-            msg = f"{original_message}. '{msgid}' was removed from pylint, see {removal_explanation}."
+            msg = f"{original_message}, '{msgid}' was removed from pylint, see {removal_explanation}."
         else:
             symbol = "bad-option-value"
-            msg = f"{original_message}. Don't recognize message '{msgid}'."
+            msg = f"{original_message}, don't recognize message '{msgid}'."
 
         return symbol, msg
 
diff --git a/tests/config/functional/ini/pylintrc_with_deleted_message.0.out b/tests/config/functional/ini/pylintrc_with_deleted_message.0.out
@@ -1,3 +1,3 @@
 ************* Module {abspath}
-{relpath}:1:0: I0012: Useless option value for '--disable'. 'buffer-builtin' was removed from pylint, see https://github.com/PyCQA/pylint/pull/4942. (useless-option-value)
-{relpath}:1:0: I0012: Useless option value for '--enable'. 'cmp-builtin' was removed from pylint, see https://github.com/PyCQA/pylint/pull/4942. (useless-option-value)
+{relpath}:1:0: I0012: Useless option value for '--disable', 'buffer-builtin' was removed from pylint, see https://github.com/PyCQA/pylint/pull/4942. (useless-option-value)
+{relpath}:1:0: I0012: Useless option value for '--enable', 'cmp-builtin' was removed from pylint, see https://github.com/PyCQA/pylint/pull/4942. (useless-option-value)
diff --git a/tests/config/functional/ini/pylintrc_with_missing_comma.2.out b/tests/config/functional/ini/pylintrc_with_missing_comma.2.out
@@ -1,3 +1,3 @@
 ************* Module {abspath}
-{relpath}:1:0: E0012: Bad option value for '--disable'. Don't recognize message 'logging-not-lazylogging-format-interpolation'. (bad-option-value)
-{relpath}:1:0: E0012: Bad option value for '--enable'. Don't recognize message 'locally-disabledsuppressed-message'. (bad-option-value)
+{relpath}:1:0: E0012: Bad option value for '--disable', don't recognize message 'logging-not-lazylogging-format-interpolation'. (bad-option-value)
+{relpath}:1:0: E0012: Bad option value for '--enable', don't recognize message 'locally-disabledsuppressed-message'. (bad-option-value)
diff --git a/tests/config/functional/setup_cfg/do_not_read_other_tools_configuration/setup.2.out b/tests/config/functional/setup_cfg/do_not_read_other_tools_configuration/setup.2.out
@@ -1,2 +1,2 @@
 ************* Module {abspath}
-{relpath}:1:0: E0012: Bad option value for '--enable'. Don't recognize message 'useless-supression'. (bad-option-value)
+{relpath}:1:0: E0012: Bad option value for '--enable', don't recognize message 'useless-supression'. (bad-option-value)
diff --git a/tests/config/functional/toml/issue_3122/toml_with_missing_comma.2.out b/tests/config/functional/toml/issue_3122/toml_with_missing_comma.2.out
@@ -1,3 +1,3 @@
 ************* Module {abspath}
-{relpath}:1:0: E0012: Bad option value for '--disable'. Don't recognize message 'logging-not-lazylogging-format-interpolation'. (bad-option-value)
-{relpath}:1:0: E0012: Bad option value for '--enable'. Don't recognize message 'locally-disabledsuppressed-message'. (bad-option-value)
+{relpath}:1:0: E0012: Bad option value for '--disable', don't recognize message 'logging-not-lazylogging-format-interpolation'. (bad-option-value)
+{relpath}:1:0: E0012: Bad option value for '--enable', don't recognize message 'locally-disabledsuppressed-message'. (bad-option-value)
diff --git a/tests/config/functional/toml/unknown_msgid/enable_unknown_msgid.2.out b/tests/config/functional/toml/unknown_msgid/enable_unknown_msgid.2.out
@@ -1,3 +1,3 @@
 ************* Module {abspath}
-{relpath}:1:0: E0012: Bad option value for '--disable'. Don't recognize message 'logging-not-layzy'. (bad-option-value)
-{relpath}:1:0: E0012: Bad option value for '--enable'. Don't recognize message 'C00000'. (bad-option-value)
+{relpath}:1:0: E0012: Bad option value for '--disable', don't recognize message 'logging-not-layzy'. (bad-option-value)
+{relpath}:1:0: E0012: Bad option value for '--enable', don't recognize message 'C00000'. (bad-option-value)
diff --git a/tests/config/test_config.py b/tests/config/test_config.py
@@ -60,7 +60,7 @@ def test_unknown_message_id(capsys: CaptureFixture) -> None:
     """Check that we correctly raise a message on an unknown id."""
     Run([str(EMPTY_MODULE), "--disable=12345"], exit=False)
     output = capsys.readouterr()
-    assert "Command line:1:0: E0012: Bad option value for '--disable'." in output.out
+    assert "Command line:1:0: E0012: Bad option value for '--disable'" in output.out
 
 
 def test_unknown_option_name(capsys: CaptureFixture) -> None:
diff --git a/tests/functional/b/bad_option_value.txt b/tests/functional/b/bad_option_value.txt
@@ -1,2 +1,2 @@
-bad-option-value:3:0:None:None::Bad option value for 'enable'. Don't recognize message 'W04044'.:HIGH
-useless-option-value:4:0:None:None::"Useless option value for 'enable'. 'execfile-builtin' was removed from pylint, see https://github.com/PyCQA/pylint/pull/4942.":HIGH
+bad-option-value:3:0:None:None::Bad option value for 'enable', don't recognize message 'W04044'.:HIGH
+useless-option-value:4:0:None:None::"Useless option value for 'enable', 'execfile-builtin' was removed from pylint, see https://github.com/PyCQA/pylint/pull/4942.":HIGH
diff --git a/tests/functional/b/bad_option_value_disable.txt b/tests/functional/b/bad_option_value_disable.txt
@@ -1,2 +1,2 @@
-bad-option-value:10:0:None:None::Bad option value for 'disable'. Don't recognize message 'a-removed-option'.:HIGH
-bad-option-value:13:0:None:None::Bad option value for 'disable'. Don't recognize message 'a-removed-option'.:HIGH
+bad-option-value:10:0:None:None::Bad option value for 'disable', don't recognize message 'a-removed-option'.:HIGH
+bad-option-value:13:0:None:None::Bad option value for 'disable', don't recognize message 'a-removed-option'.:HIGH
diff --git a/tests/functional/u/use/use_symbolic_message_instead.txt b/tests/functional/u/use/use_symbolic_message_instead.txt
@@ -1,4 +1,4 @@
-bad-option-value:1:0:None:None::Bad option value for 'disable'. Don't recognize message 'T1234'.:HIGH
+bad-option-value:1:0:None:None::Bad option value for 'disable', don't recognize message 'T1234'.:HIGH
 use-symbolic-message-instead:1:0:None:None::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead":UNDEFINED
 use-symbolic-message-instead:1:0:None:None::"'R0903' is cryptic: use '# pylint: disable=too-few-public-methods' instead":UNDEFINED
 use-symbolic-message-instead:2:0:None:None::"'c0111' is cryptic: use '# pylint: enable=missing-docstring' instead":UNDEFINED

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`************* Module {abspath}`
`2`		`-{relpath}:1:0: E0012: Bad option value for '--enable'. Don't recognize message 'useless-supression'. (bad-option-value)`
	`2`	`+{relpath}:1:0: E0012: Bad option value for '--enable', don't recognize message 'useless-supression'. (bad-option-value)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-bad-option-value:1:0:None:None::Bad option value for 'disable'. Don't recognize message 'T1234'.:HIGH`
	`1`	`+bad-option-value:1:0:None:None::Bad option value for 'disable', don't recognize message 'T1234'.:HIGH`
`2`	`2`	`use-symbolic-message-instead:1:0:None:None::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead":UNDEFINED`
`3`	`3`	`use-symbolic-message-instead:1:0:None:None::"'R0903' is cryptic: use '# pylint: disable=too-few-public-methods' instead":UNDEFINED`
`4`	`4`	`use-symbolic-message-instead:2:0:None:None::"'c0111' is cryptic: use '# pylint: enable=missing-docstring' instead":UNDEFINED`