From 876bfe5f6c756e946594e3316fec716ae358de18 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Tue, 2 Feb 2021 22:05:31 -0600
Subject: [PATCH] simplify

---
 python-package/lightgbm/dask.py        |  3 ---
 tests/python_package_test/test_dask.py | 27 ++++++++++++--------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/python-package/lightgbm/dask.py b/python-package/lightgbm/dask.py
index b1a7e2d80d64..d8945fa5fa38 100644
--- a/python-package/lightgbm/dask.py
+++ b/python-package/lightgbm/dask.py
@@ -453,9 +453,6 @@ def _predict(
 
 class _DaskLGBMModel:
 
-    # self._client is set in the constructor of classes that use this mixin
-    _client: Optional[Client] = None
-
     @property
     def client_(self) -> Client:
         """Dask client.
diff --git a/tests/python_package_test/test_dask.py b/tests/python_package_test/test_dask.py
index e004c9cf933d..cc9fa3adb184 100644
--- a/tests/python_package_test/test_dask.py
+++ b/tests/python_package_test/test_dask.py
@@ -832,18 +832,15 @@ def f(part):
     ]
 )
 def test_dask_classes_and_sklearn_equivalents_have_identical_constructors_except_client_arg(classes):
-    def _compare_spec(dask_cls, sklearn_cls):
-        dask_spec = inspect.getfullargspec(dask_cls)
-        sklearn_spec = inspect.getfullargspec(sklearn_cls)
-        assert dask_spec.varargs == sklearn_spec.varargs
-        assert dask_spec.varkw == sklearn_spec.varkw
-        assert dask_spec.kwonlyargs == sklearn_spec.kwonlyargs
-        assert dask_spec.kwonlydefaults == sklearn_spec.kwonlydefaults
-
-        # "client" should be the only different, and the final argument
-        assert dask_spec.args[:-1] == sklearn_spec.args
-        assert dask_spec.defaults[:-1] == sklearn_spec.defaults
-        assert dask_spec.args[-1] == 'client'
-        assert dask_spec.defaults[-1] is None
-
-    _compare_spec(classes[0], classes[1])
+    dask_spec = inspect.getfullargspec(classes[0])
+    sklearn_spec = inspect.getfullargspec(classes[1])
+    assert dask_spec.varargs == sklearn_spec.varargs
+    assert dask_spec.varkw == sklearn_spec.varkw
+    assert dask_spec.kwonlyargs == sklearn_spec.kwonlyargs
+    assert dask_spec.kwonlydefaults == sklearn_spec.kwonlydefaults
+
+    # "client" should be the only different, and the final argument
+    assert dask_spec.args[:-1] == sklearn_spec.args
+    assert dask_spec.defaults[:-1] == sklearn_spec.defaults
+    assert dask_spec.args[-1] == 'client'
+    assert dask_spec.defaults[-1] is None