From b35285fb2b34c5ca8c99d5d4e50cc36995974db2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 17:41:54 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/mirrors-eslint: v8.7.0 → v8.9.0](https://github.com/pre-commit/mirrors-eslint/compare/v8.7.0...v8.9.0) - [github.com/psf/black: 21.12b0 → 22.1.0](https://github.com/psf/black/compare/21.12b0...22.1.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d24c9ee73..93a4a5270 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: - id: prettier types_or: [javascript, css] - repo: https://github.com/pre-commit/mirrors-eslint - rev: v8.7.0 + rev: v8.9.0 hooks: - id: eslint files: \.js?$ @@ -51,7 +51,7 @@ repos: args: - --fix - repo: https://github.com/psf/black - rev: 21.12b0 + rev: 22.1.0 hooks: - id: black language_version: python3 From b225e696f0ec1145b92121c25c885233f4aa56d3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 17:42:12 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- debug_toolbar/panels/cache.py | 26 ++++++++++---------------- debug_toolbar/panels/signals.py | 24 +++++++++--------------- debug_toolbar/panels/sql/panel.py | 13 +++++-------- debug_toolbar/utils.py | 2 +- 4 files changed, 25 insertions(+), 40 deletions(-) diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py index 74a1155d9..74b2f3ab6 100644 --- a/debug_toolbar/panels/cache.py +++ b/debug_toolbar/panels/cache.py @@ -236,26 +236,20 @@ def _store_call_info( @property def nav_subtitle(self): cache_calls = len(self.calls) - return ( - ngettext( - "%(cache_calls)d call in %(time).2fms", - "%(cache_calls)d calls in %(time).2fms", - cache_calls, - ) - % {"cache_calls": cache_calls, "time": self.total_time} - ) + return ngettext( + "%(cache_calls)d call in %(time).2fms", + "%(cache_calls)d calls in %(time).2fms", + cache_calls, + ) % {"cache_calls": cache_calls, "time": self.total_time} @property def title(self): count = len(getattr(settings, "CACHES", ["default"])) - return ( - ngettext( - "Cache calls from %(count)d backend", - "Cache calls from %(count)d backends", - count, - ) - % {"count": count} - ) + return ngettext( + "Cache calls from %(count)d backend", + "Cache calls from %(count)d backends", + count, + ) % {"count": count} def enable_instrumentation(self): for alias in cache.caches: diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py index 5e81fa497..41f669f2c 100644 --- a/debug_toolbar/panels/signals.py +++ b/debug_toolbar/panels/signals.py @@ -53,22 +53,16 @@ def nav_subtitle(self): # here we have to handle a double count translation, hence the # hard coding of one signal if num_signals == 1: - return ( - ngettext( - "%(num_receivers)d receiver of 1 signal", - "%(num_receivers)d receivers of 1 signal", - num_receivers, - ) - % {"num_receivers": num_receivers} - ) - return ( - ngettext( - "%(num_receivers)d receiver of %(num_signals)d signals", - "%(num_receivers)d receivers of %(num_signals)d signals", + return ngettext( + "%(num_receivers)d receiver of 1 signal", + "%(num_receivers)d receivers of 1 signal", num_receivers, - ) - % {"num_receivers": num_receivers, "num_signals": num_signals} - ) + ) % {"num_receivers": num_receivers} + return ngettext( + "%(num_receivers)d receiver of %(num_signals)d signals", + "%(num_receivers)d receivers of %(num_signals)d signals", + num_receivers, + ) % {"num_receivers": num_receivers, "num_signals": num_signals} title = _("Signals") diff --git a/debug_toolbar/panels/sql/panel.py b/debug_toolbar/panels/sql/panel.py index f8b92a5bd..00737a42d 100644 --- a/debug_toolbar/panels/sql/panel.py +++ b/debug_toolbar/panels/sql/panel.py @@ -122,14 +122,11 @@ def nav_subtitle(self): @property def title(self): count = len(self._databases) - return ( - ngettext( - "SQL queries from %(count)d connection", - "SQL queries from %(count)d connections", - count, - ) - % {"count": count} - ) + return ngettext( + "SQL queries from %(count)d connection", + "SQL queries from %(count)d connections", + count, + ) % {"count": count} template = "debug_toolbar/panels/sql.html" diff --git a/debug_toolbar/utils.py b/debug_toolbar/utils.py index 57965c457..ae4d49168 100644 --- a/debug_toolbar/utils.py +++ b/debug_toolbar/utils.py @@ -210,7 +210,7 @@ def getframeinfo(frame, context=1): for line in first_lines[:2]: # File coding may be specified. Match pattern from PEP-263 # (https://www.python.org/dev/peps/pep-0263/) - match = re.search(br"coding[:=]\s*([-\w.]+)", line) + match = re.search(rb"coding[:=]\s*([-\w.]+)", line) if match: encoding = match.group(1).decode("ascii") break