Use f strings in error messages

ThomasGesseyJonesPX · ThomasGesseyJonesPX · commit 5996d430bd4c · 2024-11-07T09:47:15.000Z
diff --git a/sklearn/decomposition/_incremental_pca.py b/sklearn/decomposition/_incremental_pca.py
@@ -308,9 +308,9 @@ def partial_fit(self, X, y=None, check_input=True):
             )
         elif self.n_components > n_samples and first_pass:
             raise ValueError(
-                "n_components=%r must be less or equal to the batch number "
-                "of samples %d for the first partial_fit "
-                "call." % (self.n_components, n_samples)
+                f"n_components={self.n_components} must be less or equal to "
+                f"the batch number of samples {n_samples} for the first "
+                "partial_fit call."
             )
         else:
             self.n_components_ = self.n_components
diff --git a/sklearn/decomposition/tests/test_incremental_pca.py b/sklearn/decomposition/tests/test_incremental_pca.py
@@ -144,10 +144,8 @@ def test_incremental_pca_validation():
     with pytest.raises(
         ValueError,
         match=(
-            "n_components={} must be"
-            " less or equal to the batch number of"
-            " samples {} for the first partial_fit"
-            " call.".format(n_components, n_samples)
+            f"n_components={n_components} must be less or equal to the batch "
+            f"number of samples {n_samples} for the first partial_fit call."
         ),
     ):
         IncrementalPCA(n_components=n_components).partial_fit(X)

Original file line number	Diff line number	Diff line change
`@@ -308,9 +308,9 @@ def partial_fit(self, X, y=None, check_input=True):`
`308`	`308`	`)`
`309`	`309`	`elif self.n_components > n_samples and first_pass:`
`310`	`310`	`raise ValueError(`
`311`		`- "n_components=%r must be less or equal to the batch number "`
`312`		`- "of samples %d for the first partial_fit "`
`313`		`- "call." % (self.n_components, n_samples)`
	`311`	`+ f"n_components={self.n_components} must be less or equal to "`
	`312`	`+ f"the batch number of samples {n_samples} for the first "`
	`313`	`+ "partial_fit call."`
`314`	`314`	`)`
`315`	`315`	`else:`
`316`	`316`	`self.n_components_ = self.n_components`