Skip to content

Commit 3e508b1

Browse files
authored
Revert "Rename _utils module to utils" (#481)
1 parent 1c4ad71 commit 3e508b1

20 files changed

+71
-71
lines changed
File renamed without changes.

pylsp/config/config.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import pluggy
1111
from pluggy._hooks import HookImpl
1212

13-
from pylsp import utils, hookspecs, uris, PYLSP
13+
from pylsp import _utils, hookspecs, uris, PYLSP
1414

1515
# See compatibility note on `group` keyword:
1616
# https://docs.python.org/3/library/importlib.metadata.html#entry-points
@@ -94,11 +94,11 @@ def __init__(self, root_uri, init_opts, process_id, capabilities):
9494
log.info("Loaded pylsp plugin %s from %s", name, plugin)
9595

9696
for plugin_conf in self._pm.hook.pylsp_settings(config=self):
97-
self._plugin_settings = utils.merge_dicts(
97+
self._plugin_settings = _utils.merge_dicts(
9898
self._plugin_settings, plugin_conf
9999
)
100100

101-
self._plugin_settings = utils.merge_dicts(
101+
self._plugin_settings = _utils.merge_dicts(
102102
self._plugin_settings, self._init_opts.get("pylsp", {})
103103
)
104104

@@ -144,10 +144,10 @@ def settings(self, document_path=None):
144144
sources = self._settings.get("configurationSources", DEFAULT_CONFIG_SOURCES)
145145

146146
# Plugin configuration
147-
settings = utils.merge_dicts(settings, self._plugin_settings)
147+
settings = _utils.merge_dicts(settings, self._plugin_settings)
148148

149149
# LSP configuration
150-
settings = utils.merge_dicts(settings, self._settings)
150+
settings = _utils.merge_dicts(settings, self._settings)
151151

152152
# User configuration
153153
for source_name in reversed(sources):
@@ -158,7 +158,7 @@ def settings(self, document_path=None):
158158
log.debug(
159159
"Got user config from %s: %s", source.__class__.__name__, source_conf
160160
)
161-
settings = utils.merge_dicts(settings, source_conf)
161+
settings = _utils.merge_dicts(settings, source_conf)
162162

163163
# Project configuration
164164
for source_name in reversed(sources):
@@ -169,15 +169,15 @@ def settings(self, document_path=None):
169169
log.debug(
170170
"Got project config from %s: %s", source.__class__.__name__, source_conf
171171
)
172-
settings = utils.merge_dicts(settings, source_conf)
172+
settings = _utils.merge_dicts(settings, source_conf)
173173

174174
log.debug("With configuration: %s", settings)
175175

176176
return settings
177177

178178
def find_parents(self, path, names):
179179
root_path = uris.to_fs_path(self._root_uri)
180-
return utils.find_parents(root_path, path, names)
180+
return _utils.find_parents(root_path, path, names)
181181

182182
def plugin_settings(self, plugin, document_path=None):
183183
return (

pylsp/config/flake8_conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import logging
55
import os
6-
from pylsp.utils import find_parents
6+
from pylsp._utils import find_parents
77
from .source import ConfigSource
88

99
log = logging.getLogger(__name__)

pylsp/config/pycodestyle_conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright 2021- Python Language Server Contributors.
33

44
import pycodestyle
5-
from pylsp.utils import find_parents
5+
from pylsp._utils import find_parents
66
from .source import ConfigSource
77

88

pylsp/plugins/autopep8_format.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from autopep8 import fix_code, continued_indentation as autopep8_c_i
88

99
from pylsp import hookimpl
10-
from pylsp.utils import get_eol_chars
10+
from pylsp._utils import get_eol_chars
1111

1212
log = logging.getLogger(__name__)
1313

pylsp/plugins/definition.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import jedi
88

9-
from pylsp import hookimpl, uris, utils
9+
from pylsp import hookimpl, uris, _utils
1010

1111
if TYPE_CHECKING:
1212
from jedi.api import Script
@@ -44,7 +44,7 @@ def pylsp_definitions(
4444
config: Config, document: Document, position: Dict[str, int]
4545
) -> List[Dict[str, Any]]:
4646
settings = config.plugin_settings("jedi_definition")
47-
code_position = utils.position_to_jedi_linecolumn(document, position)
47+
code_position = _utils.position_to_jedi_linecolumn(document, position)
4848
script = document.jedi_script(use_document_path=True)
4949
auto_import_modules = jedi.settings.auto_import_modules
5050

pylsp/plugins/highlight.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# Copyright 2021- Python Language Server Contributors.
33

44
import logging
5-
from pylsp import hookimpl, lsp, utils
5+
from pylsp import hookimpl, lsp, _utils
66

77
log = logging.getLogger(__name__)
88

99

1010
@hookimpl
1111
def pylsp_document_highlight(document, position):
12-
code_position = utils.position_to_jedi_linecolumn(document, position)
12+
code_position = _utils.position_to_jedi_linecolumn(document, position)
1313
usages = document.jedi_script().get_references(**code_position)
1414

1515
def is_valid(definition):

pylsp/plugins/hover.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
import logging
55

6-
from pylsp import hookimpl, utils
6+
from pylsp import hookimpl, _utils
77

88
log = logging.getLogger(__name__)
99

1010

1111
@hookimpl
1212
def pylsp_hover(config, document, position):
13-
code_position = utils.position_to_jedi_linecolumn(document, position)
13+
code_position = _utils.position_to_jedi_linecolumn(document, position)
1414
definitions = document.jedi_script(use_document_path=True).infer(**code_position)
1515
word = document.word_at_position(position)
1616

@@ -28,7 +28,7 @@ def pylsp_hover(config, document, position):
2828

2929
hover_capabilities = config.capabilities.get("textDocument", {}).get("hover", {})
3030
supported_markup_kinds = hover_capabilities.get("contentFormat", ["markdown"])
31-
preferred_markup_kind = utils.choose_markup_kind(supported_markup_kinds)
31+
preferred_markup_kind = _utils.choose_markup_kind(supported_markup_kinds)
3232

3333
# Find first exact matching signature
3434
signature = next(
@@ -41,7 +41,7 @@ def pylsp_hover(config, document, position):
4141
)
4242

4343
return {
44-
"contents": utils.format_docstring(
44+
"contents": _utils.format_docstring(
4545
# raw docstring returns only doc, without signature
4646
definition.docstring(raw=True),
4747
preferred_markup_kind,

pylsp/plugins/jedi_completion.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import parso
88

9-
from pylsp import utils, hookimpl, lsp
9+
from pylsp import _utils, hookimpl, lsp
1010
from pylsp.plugins._resolvers import LABEL_RESOLVER, SNIPPET_RESOLVER
1111

1212
log = logging.getLogger(__name__)
@@ -41,7 +41,7 @@ def pylsp_completions(config, document, position):
4141
# pylint: disable=too-many-locals
4242
settings = config.plugin_settings("jedi_completion", document_path=document.path)
4343
resolve_eagerly = settings.get("eager", False)
44-
code_position = utils.position_to_jedi_linecolumn(document, position)
44+
code_position = _utils.position_to_jedi_linecolumn(document, position)
4545

4646
code_position["fuzzy"] = settings.get("fuzzy", False)
4747
completions = document.jedi_script(use_document_path=True).complete(**code_position)
@@ -55,7 +55,7 @@ def pylsp_completions(config, document, position):
5555
item_capabilities = completion_capabilities.get("completionItem", {})
5656
snippet_support = item_capabilities.get("snippetSupport")
5757
supported_markup_kinds = item_capabilities.get("documentationFormat", ["markdown"])
58-
preferred_markup_kind = utils.choose_markup_kind(supported_markup_kinds)
58+
preferred_markup_kind = _utils.choose_markup_kind(supported_markup_kinds)
5959

6060
should_include_params = settings.get("include_params")
6161
should_include_class_objects = settings.get("include_class_objects", False)
@@ -146,7 +146,7 @@ def pylsp_completion_item_resolve(config, completion_item, document):
146146
)
147147
item_capabilities = completion_capabilities.get("completionItem", {})
148148
supported_markup_kinds = item_capabilities.get("documentationFormat", ["markdown"])
149-
preferred_markup_kind = utils.choose_markup_kind(supported_markup_kinds)
149+
preferred_markup_kind = _utils.choose_markup_kind(supported_markup_kinds)
150150

151151
if shared_data:
152152
completion, data = shared_data
@@ -209,7 +209,7 @@ def _resolve_completion(completion, d, markup_kind: str):
209209
# pylint: disable=broad-except
210210
completion["detail"] = _detail(d)
211211
try:
212-
docs = utils.format_docstring(
212+
docs = _utils.format_docstring(
213213
d.docstring(raw=True),
214214
signatures=[signature.to_string() for signature in d.get_signatures()],
215215
markup_kind=markup_kind,

pylsp/plugins/jedi_rename.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import logging
55

6-
from pylsp import hookimpl, uris, utils
6+
from pylsp import hookimpl, uris, _utils
77

88
log = logging.getLogger(__name__)
99

@@ -15,7 +15,7 @@ def pylsp_rename(
1515
log.debug(
1616
"Executing rename of %s to %s", document.word_at_position(position), new_name
1717
)
18-
kwargs = utils.position_to_jedi_linecolumn(document, position)
18+
kwargs = _utils.position_to_jedi_linecolumn(document, position)
1919
kwargs["new_name"] = new_name
2020
try:
2121
refactoring = document.jedi_script().rename(**kwargs)
@@ -54,6 +54,6 @@ def pylsp_rename(
5454

5555
def _num_lines(file_contents):
5656
"Count the number of lines in the given string."
57-
if utils.get_eol_chars(file_contents):
57+
if _utils.get_eol_chars(file_contents):
5858
return len(file_contents.splitlines())
5959
return 0

0 commit comments

Comments
 (0)