From bea53a4a433277c987f5d8ada6b4f41e1901db5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jun 2022 13:06:48 +0000 Subject: [PATCH 1/2] build(deps): bump pep8-naming from 0.11.1 to 0.13.0 Bumps [pep8-naming](https://github.com/PyCQA/pep8-naming) from 0.11.1 to 0.13.0. - [Release notes](https://github.com/PyCQA/pep8-naming/releases) - [Changelog](https://github.com/PyCQA/pep8-naming/blob/main/CHANGELOG.rst) - [Commits](https://github.com/PyCQA/pep8-naming/compare/0.11.1...0.13.0) --- updated-dependencies: - dependency-name: pep8-naming dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- linter-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linter-requirements.txt b/linter-requirements.txt index ec736a59c5..66dd411ef5 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -6,5 +6,5 @@ types-certifi types-redis types-setuptools flake8-bugbear==21.4.3 -pep8-naming==0.11.1 +pep8-naming==0.13.0 pre-commit # local linting From 1060b5e5839e739314d2dcd5ea9811670a445000 Mon Sep 17 00:00:00 2001 From: Neel Shah Date: Tue, 28 Jun 2022 17:29:48 +0200 Subject: [PATCH 2/2] Make pep8 happy --- sentry_sdk/_queue.py | 26 +++++++++++++------------- sentry_sdk/integrations/__init__.py | 2 +- sentry_sdk/utils.py | 2 +- sentry_sdk/worker.py | 6 +++--- tests/test_client.py | 14 +++++++------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sentry_sdk/_queue.py b/sentry_sdk/_queue.py index e368da2229..fc845f70d1 100644 --- a/sentry_sdk/_queue.py +++ b/sentry_sdk/_queue.py @@ -21,15 +21,15 @@ if MYPY: from typing import Any -__all__ = ["Empty", "Full", "Queue"] +__all__ = ["EmptyError", "FullError", "Queue"] -class Empty(Exception): +class EmptyError(Exception): "Exception raised by Queue.get(block=0)/get_nowait()." pass -class Full(Exception): +class FullError(Exception): "Exception raised by Queue.put(block=0)/put_nowait()." pass @@ -134,16 +134,16 @@ def put(self, item, block=True, timeout=None): If optional args 'block' is true and 'timeout' is None (the default), block if necessary until a free slot is available. If 'timeout' is a non-negative number, it blocks at most 'timeout' seconds and raises - the Full exception if no free slot was available within that time. + the FullError exception if no free slot was available within that time. Otherwise ('block' is false), put an item on the queue if a free slot - is immediately available, else raise the Full exception ('timeout' + is immediately available, else raise the FullError exception ('timeout' is ignored in that case). """ with self.not_full: if self.maxsize > 0: if not block: if self._qsize() >= self.maxsize: - raise Full() + raise FullError() elif timeout is None: while self._qsize() >= self.maxsize: self.not_full.wait() @@ -154,7 +154,7 @@ def put(self, item, block=True, timeout=None): while self._qsize() >= self.maxsize: remaining = endtime - time() if remaining <= 0.0: - raise Full + raise FullError() self.not_full.wait(remaining) self._put(item) self.unfinished_tasks += 1 @@ -166,15 +166,15 @@ def get(self, block=True, timeout=None): If optional args 'block' is true and 'timeout' is None (the default), block if necessary until an item is available. If 'timeout' is a non-negative number, it blocks at most 'timeout' seconds and raises - the Empty exception if no item was available within that time. + the EmptyError exception if no item was available within that time. Otherwise ('block' is false), return an item if one is immediately - available, else raise the Empty exception ('timeout' is ignored + available, else raise the EmptyError exception ('timeout' is ignored in that case). """ with self.not_empty: if not block: if not self._qsize(): - raise Empty() + raise EmptyError() elif timeout is None: while not self._qsize(): self.not_empty.wait() @@ -185,7 +185,7 @@ def get(self, block=True, timeout=None): while not self._qsize(): remaining = endtime - time() if remaining <= 0.0: - raise Empty() + raise EmptyError() self.not_empty.wait(remaining) item = self._get() self.not_full.notify() @@ -195,7 +195,7 @@ def put_nowait(self, item): """Put an item into the queue without blocking. Only enqueue the item if a free slot is immediately available. - Otherwise raise the Full exception. + Otherwise raise the FullError exception. """ return self.put(item, block=False) @@ -203,7 +203,7 @@ def get_nowait(self): """Remove and return an item from the queue without blocking. Only get an item if one is immediately available. Otherwise - raise the Empty exception. + raise the EmptyError exception. """ return self.get(block=False) diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py index 114a3a1f41..68445d3416 100644 --- a/sentry_sdk/integrations/__init__.py +++ b/sentry_sdk/integrations/__init__.py @@ -146,7 +146,7 @@ def setup_integrations( return integrations -class DidNotEnable(Exception): +class DidNotEnable(Exception): # noqa: N818 """ The integration could not be enabled due to a trivial user error like `flask` not being installed for the `FlaskIntegration`. diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py index 0a735a1e20..38ba4d7857 100644 --- a/sentry_sdk/utils.py +++ b/sentry_sdk/utils.py @@ -931,7 +931,7 @@ def transaction_from_function(func): disable_capture_event = ContextVar("disable_capture_event") -class ServerlessTimeoutWarning(Exception): +class ServerlessTimeoutWarning(Exception): # noqa: N818 """Raised when a serverless method is about to reach its timeout.""" pass diff --git a/sentry_sdk/worker.py b/sentry_sdk/worker.py index a06fb8f0d1..310ba3bfb4 100644 --- a/sentry_sdk/worker.py +++ b/sentry_sdk/worker.py @@ -3,7 +3,7 @@ from time import sleep, time from sentry_sdk._compat import check_thread_support -from sentry_sdk._queue import Queue, Full +from sentry_sdk._queue import Queue, FullError from sentry_sdk.utils import logger from sentry_sdk.consts import DEFAULT_QUEUE_SIZE @@ -81,7 +81,7 @@ def kill(self): if self._thread: try: self._queue.put_nowait(_TERMINATOR) - except Full: + except FullError: logger.debug("background worker queue full, kill failed") self._thread = None @@ -114,7 +114,7 @@ def submit(self, callback): try: self._queue.put_nowait(callback) return True - except Full: + except FullError: return False def _target(self): diff --git a/tests/test_client.py b/tests/test_client.py index ffdb831e39..5523647870 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -35,13 +35,13 @@ from collections.abc import Mapping -class EventCaptured(Exception): +class EventCapturedError(Exception): pass class _TestTransport(Transport): def capture_event(self, event): - raise EventCaptured(event) + raise EventCapturedError(event) def test_transport_option(monkeypatch): @@ -273,7 +273,7 @@ def e(exc): e(ZeroDivisionError()) e(MyDivisionError()) - pytest.raises(EventCaptured, lambda: e(ValueError())) + pytest.raises(EventCapturedError, lambda: e(ValueError())) def test_with_locals_enabled(sentry_init, capture_events): @@ -400,8 +400,8 @@ def test_attach_stacktrace_disabled(sentry_init, capture_events): def test_capture_event_works(sentry_init): sentry_init(transport=_TestTransport()) - pytest.raises(EventCaptured, lambda: capture_event({})) - pytest.raises(EventCaptured, lambda: capture_event({})) + pytest.raises(EventCapturedError, lambda: capture_event({})) + pytest.raises(EventCapturedError, lambda: capture_event({})) @pytest.mark.parametrize("num_messages", [10, 20]) @@ -744,10 +744,10 @@ def test_errno_errors(sentry_init, capture_events): sentry_init() events = capture_events() - class Foo(Exception): + class FooError(Exception): errno = 69 - capture_exception(Foo()) + capture_exception(FooError()) (event,) = events