From 20144415d9ec562342682e474bd6d028b469cb2c Mon Sep 17 00:00:00 2001
From: Tobias Krabel <tobias.krabel@databricks.com>
Date: Thu, 17 Aug 2023 11:36:43 +0200
Subject: [PATCH] rebase master into HEAD

---
 pylsp/plugins/rope_autoimport.py |  2 +-
 test/test_utils.py               | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pylsp/plugins/rope_autoimport.py b/pylsp/plugins/rope_autoimport.py
index be40fe41..dc400c92 100644
--- a/pylsp/plugins/rope_autoimport.py
+++ b/pylsp/plugins/rope_autoimport.py
@@ -20,7 +20,7 @@
 log = logging.getLogger(__name__)
 
 _score_pow = 5
-_score_max = 10**_score_pow
+_score_max = 10 ** _score_pow
 MAX_RESULTS = 1000
 
 
diff --git a/test/test_utils.py b/test/test_utils.py
index 7d01ba01..28689835 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -138,10 +138,13 @@ def test_find_parents(tmpdir):
 
 
 def test_merge_dicts():
-    assert _utils.merge_dicts(
-        {"a": True, "b": {"x": 123, "y": {"hello": "world"}}},
-        {"a": False, "b": {"y": [], "z": 987}},
-    ) == {"a": False, "b": {"x": 123, "y": [], "z": 987}}
+    assert (
+        _utils.merge_dicts(
+            {"a": True, "b": {"x": 123, "y": {"hello": "world"}}},
+            {"a": False, "b": {"y": [], "z": 987}},
+        )
+        == {"a": False, "b": {"x": 123, "y": [], "z": 987}}
+    )
 
 
 def test_clip_column():