Fixing the init and set_params test. Cf. scikit-learn#22537

avm19 · avm19 · commit 5add60bed1aa · 2022-03-31T21:30:14.000-04:00
diff --git a/sklearn/naive_bayes.py b/sklearn/naive_bayes.py
@@ -1956,15 +1956,22 @@ def _estimators(self):
         which expects lists of tuples of len 2.
         """
         # Implemented in the image and likeness of ColumnTranformer._transformers
-        return [(name, e) for name, e, _ in self.estimatorNBs]
+        try:
+            return [(name, e) for name, e, _ in self.estimatorNBs]
+        except (TypeError, ValueError):  # to pass init test in test_common.py
+            return self.estimatorNBs
 
     @_estimators.setter
     def _estimators(self, value):
         # Implemented in the image and likeness of ColumnTranformer._transformers
         # TODO: Is renaming or changing the order legal? Swap `name` and `_`?
-        self.estimatorNBs = [
-            (name, e, col) for ((name, e), (_, _, col)) in zip(value, self.estimatorNBs)
-        ]
+        try:
+            self.estimatorNBs = [
+                (name, e, col)
+                for ((name, e), (_, _, col)) in zip(value, self.estimatorNBs)
+            ]
+        except (TypeError, ValueError):  # to pass init test in test_common.py
+            self.estimatorNBs = value
 
     def get_params(self, deep=True):
         """Get parameters for this estimator.
