Fix linting issues reported by the latest version of Ruff (#585)

pylsp/config/source.py

@@ -53,16 +53,16 @@ def _get_opt(cls, config, key, option, opt_type):
             if not config.has_option(key, opt_key):
                 continue
 
-            if opt_type == bool:
+            if opt_type is bool:
                 return config.getboolean(key, opt_key)
 
-            if opt_type == int:
+            if opt_type is int:
                 return config.getint(key, opt_key)
 
-            if opt_type == str:
+            if opt_type is str:
                 return config.get(key, opt_key)
 
-            if opt_type == list:
+            if opt_type is list:
                 return cls._parse_list_opt(config.get(key, opt_key))
 
             raise ValueError("Unknown option type: %s" % opt_type)

test/fixtures.py

@@ -3,7 +3,6 @@
 
 import os
 from io import StringIO
-from test.test_utils import CALL_TIMEOUT_IN_SECONDS, ClientServerPair
 from unittest.mock import MagicMock
 
 import pytest
@@ -15,6 +14,7 @@
 from pylsp.config.config import Config
 from pylsp.python_lsp import PythonLSPServer
 from pylsp.workspace import Document, Workspace
+from test.test_utils import CALL_TIMEOUT_IN_SECONDS, ClientServerPair
 
 DOC_URI = uris.from_fs_path(__file__)
 DOC = """import sys

test/plugins/test_autoimport.py

@@ -1,7 +1,5 @@
 # Copyright 2022- Python Language Server Contributors.
 
-from test.test_notebook_document import wait_for_condition
-from test.test_utils import send_initialize_request, send_notebook_did_open
 from typing import Any, Dict, List
 from unittest.mock import Mock, patch
 
@@ -22,6 +20,8 @@
     pylsp_completions as pylsp_autoimport_completions,
 )
 from pylsp.workspace import Workspace
+from test.test_notebook_document import wait_for_condition
+from test.test_utils import send_initialize_request, send_notebook_did_open
 
 DOC_URI = uris.from_fs_path(__file__)
 

test/test_configuration.py

@@ -1,12 +1,12 @@
 # Copyright 2021- Python Language Server Contributors.
 
-from test.test_notebook_document import wait_for_condition
-from test.test_utils import send_initialize_request
 from unittest.mock import patch
 
 import pytest
 
 from pylsp import IS_WIN
+from test.test_notebook_document import wait_for_condition
+from test.test_utils import send_initialize_request
 
 INITIALIZATION_OPTIONS = {
     "pylsp": {

test/test_document.py

@@ -1,9 +1,8 @@
 # Copyright 2017-2020 Palantir Technologies, Inc.
 # Copyright 2021- Python Language Server Contributors.
 
-from test.fixtures import DOC, DOC_URI
-
 from pylsp.workspace import Document
+from test.fixtures import DOC, DOC_URI
 
 
 def test_document_props(doc):

test/test_language_server.py

@@ -4,12 +4,13 @@
 import os
 import sys
 import time
-from test.test_utils import ClientServerPair, send_initialize_request
 
 import pytest
 from flaky import flaky
 from pylsp_jsonrpc.exceptions import JsonRpcMethodNotFound
 
+from test.test_utils import ClientServerPair, send_initialize_request
+
 RUNNING_IN_CI = bool(os.environ.get("CI"))
 
 CALL_TIMEOUT_IN_SECONDS = 10

test/test_notebook_document.py

@@ -1,18 +1,18 @@
 # Copyright 2021- Python Language Server Contributors.
 
 import time
-from test.test_utils import (
-    CALL_TIMEOUT_IN_SECONDS,
-    send_initialize_request,
-    send_notebook_did_open,
-)
 from unittest.mock import call, patch
 
 import pytest
 
 from pylsp import IS_WIN
 from pylsp.lsp import NotebookCellKind
 from pylsp.workspace import Notebook
+from test.test_utils import (
+    CALL_TIMEOUT_IN_SECONDS,
+    send_initialize_request,
+    send_notebook_did_open,
+)
 
 
 def wait_for_condition(condition, timeout=CALL_TIMEOUT_IN_SECONDS):

test/test_uris.py

@@ -1,11 +1,10 @@
 # Copyright 2017-2020 Palantir Technologies, Inc.
 # Copyright 2021- Python Language Server Contributors.
 
-from test import unix_only, windows_only
-
 import pytest
 
 from pylsp import uris
+from test import unix_only, windows_only
 
 
 @unix_only