From e814b7dd145cd0d4c1811bf3e42d2fc3e50202cc Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Thu, 25 Nov 2021 11:06:40 -0500 Subject: [PATCH 1/3] Fix formatting a log message --- pylsp/plugins/_resolvers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pylsp/plugins/_resolvers.py b/pylsp/plugins/_resolvers.py index 4fae86e7..43be8311 100644 --- a/pylsp/plugins/_resolvers.py +++ b/pylsp/plugins/_resolvers.py @@ -82,8 +82,9 @@ def resolve(self, completion): return self.callback(completion, sig) except Exception as e: # pylint: disable=broad-except log.warning( - 'Something went wrong when resolving label for {completion}: {e}', - completion=completion, e=e + 'Something went wrong when resolving label for {completion}: {e}'.format( + completion=completion, e=e + ), ) return self.resolve_on_error From 61aa69d51a94cbb82ae50e834259100448ee01cb Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Thu, 25 Nov 2021 11:12:50 -0500 Subject: [PATCH 2/3] Use f-string to please Pylint --- .pylintrc | 1 + pylsp/plugins/_resolvers.py | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pylintrc b/.pylintrc index 326751fa..ebe4f30f 100644 --- a/.pylintrc +++ b/.pylintrc @@ -18,6 +18,7 @@ disable = too-many-instance-attributes, import-error, consider-using-f-string, + logging-fstring-interpolation [REPORTS] diff --git a/pylsp/plugins/_resolvers.py b/pylsp/plugins/_resolvers.py index 43be8311..9310187b 100644 --- a/pylsp/plugins/_resolvers.py +++ b/pylsp/plugins/_resolvers.py @@ -82,9 +82,7 @@ def resolve(self, completion): return self.callback(completion, sig) except Exception as e: # pylint: disable=broad-except log.warning( - 'Something went wrong when resolving label for {completion}: {e}'.format( - completion=completion, e=e - ), + log.warning(f'Something went wrong when resolving label for {completion}: {e}') ) return self.resolve_on_error From 019c61de473f0ebc73e746a7e8f3b30ae02c20f4 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Thu, 25 Nov 2021 11:32:47 -0500 Subject: [PATCH 3/3] Fix wrong copy/paste --- pylsp/plugins/_resolvers.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pylsp/plugins/_resolvers.py b/pylsp/plugins/_resolvers.py index 9310187b..3483d3dc 100644 --- a/pylsp/plugins/_resolvers.py +++ b/pylsp/plugins/_resolvers.py @@ -81,9 +81,7 @@ def resolve(self, completion): sig = completion.get_signatures() return self.callback(completion, sig) except Exception as e: # pylint: disable=broad-except - log.warning( - log.warning(f'Something went wrong when resolving label for {completion}: {e}') - ) + log.warning(f'Something went wrong when resolving label for {completion}: {e}') return self.resolve_on_error