Skip to content

Commit 7120590

Browse files
committed
Tweak wording in deprecation messages
- Avoid a period at the end of `issue` line. - Change post-gone message wording.
1 parent d23d12b commit 7120590

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/pip/_internal/utils/deprecation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def deprecated(
8989
gone_in,
9090
"pip {} will enforce this behaviour change."
9191
if not is_gone
92-
else "This behavior change has been enforced since pip {}.",
92+
else "Since pip {}, this is no longer supported.",
9393
),
9494
(
9595
replacement,
@@ -101,7 +101,7 @@ def deprecated(
101101
),
102102
(
103103
issue,
104-
"Discussion can be found at https://github.com/pypa/pip/issues/{}.",
104+
"Discussion can be found at https://github.com/pypa/pip/issues/{}",
105105
),
106106
]
107107

@@ -111,7 +111,7 @@ def deprecated(
111111
if value is not None
112112
)
113113

114-
# Raise as an error if this behaviour is no longer supported.
114+
# Raise as an error if this behaviour is deprecated.
115115
if is_gone:
116116
raise PipDeprecationWarning(message)
117117

tests/unit/test_utils.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -934,10 +934,9 @@ def test_deprecated_message_reads_well():
934934

935935
assert message == (
936936
"DEPRECATION: Stop doing this! "
937-
"This behavior change has been enforced since pip 1.0. "
937+
"Since pip 1.0, this is no longer supported. "
938938
"A possible replacement is to be nicer. "
939-
"Discussion can be found at "
940-
"https://github.com/pypa/pip/issues/100000."
939+
"Discussion can be found at https://github.com/pypa/pip/issues/100000"
941940
)
942941

943942

0 commit comments

Comments
 (0)