rebase master into HEAD

Author: tkrabel-db

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
 
 

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():