Skip to content

build(deps): bump black from 19.03b0 to 19.10b0 #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linter-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
black==19.03b0
black==19.10b0
flake8
flake8-import-order
mypy==0.761
Expand Down
10 changes: 5 additions & 5 deletions sentry_sdk/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def capture_message(

@hubmethod
def capture_exception(
error=None # type: Optional[BaseException]
error=None, # type: Optional[BaseException]
):
# type: (...) -> Optional[str]
hub = Hub.current
Expand Down Expand Up @@ -118,15 +118,15 @@ def configure_scope():

@overload # noqa
def configure_scope(
callback # type: Callable[[Scope], None]
callback, # type: Callable[[Scope], None]
):
# type: (...) -> None
pass


@hubmethod # noqa
def configure_scope(
callback=None # type: Optional[Callable[[Scope], None]]
callback=None, # type: Optional[Callable[[Scope], None]]
):
# type: (...) -> Optional[ContextManager[Scope]]
hub = Hub.current
Expand All @@ -152,15 +152,15 @@ def push_scope():

@overload # noqa
def push_scope(
callback # type: Callable[[Scope], None]
callback, # type: Callable[[Scope], None]
):
# type: (...) -> None
pass


@hubmethod # noqa
def push_scope(
callback=None # type: Optional[Callable[[Scope], None]]
callback=None, # type: Optional[Callable[[Scope], None]]
):
# type: (...) -> Optional[ContextManager[Scope]]
hub = Hub.current
Expand Down
2 changes: 1 addition & 1 deletion sentry_sdk/integrations/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@


def ignore_logger(
name # type: str
name, # type: str
):
# type: (...) -> None
"""This disables recording (both in breadcrumbs and as events) calls to
Expand Down
14 changes: 7 additions & 7 deletions tests/integrations/aiohttp/test_aiohttp.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ async def hello(request):
resp = await client.get("/")
assert resp.status == 500

event, = events
(event,) = events

assert (
event["transaction"]
== "tests.integrations.aiohttp.test_aiohttp.test_basic.<locals>.hello"
)

exception, = event["exception"]["values"]
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"
request = event["request"]
host = request["headers"]["Host"]
Expand Down Expand Up @@ -67,8 +67,8 @@ async def hello(request):
resp = await client.post("/", json=body)
assert resp.status == 500

event, = events
exception, = event["exception"]["values"]
(event,) = events
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"
request = event["request"]

Expand All @@ -95,8 +95,8 @@ async def hello(request):
resp = await client.post("/", json=body)
assert resp.status == 500

event, = events
exception, = event["exception"]["values"]
(event,) = events
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"
request = event["request"]

Expand Down Expand Up @@ -179,7 +179,7 @@ async def hello(request):
resp = await client.get("/")
assert resp.status == 200

event, = events
(event,) = events

assert event["type"] == "transaction"
assert (
Expand Down
2 changes: 1 addition & 1 deletion tests/integrations/argv/test_argv.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ def test_basic(sentry_init, capture_events, monkeypatch):

events = capture_events()
capture_message("hi")
event, = events
(event,) = events
assert event["extra"]["sys.argv"] == argv
12 changes: 6 additions & 6 deletions tests/integrations/asgi/test_asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_sync_request_data(sentry_init, app, capture_events):

assert response.status_code == 200

event, = events
(event,) = events
assert event["transaction"] == "tests.integrations.asgi.test_asgi.app.<locals>.hi"
assert event["request"]["env"] == {"REMOTE_ADDR": "testclient"}
assert set(event["request"]["headers"]) == {
Expand All @@ -55,7 +55,7 @@ def test_sync_request_data(sentry_init, app, capture_events):
# Assert that state is not leaked
events.clear()
capture_message("foo")
event, = events
(event,) = events

assert "request" not in event
assert "transaction" not in event
Expand All @@ -70,7 +70,7 @@ def test_async_request_data(sentry_init, app, capture_events):

assert response.status_code == 200

event, = events
(event,) = events
assert event["transaction"] == "tests.integrations.asgi.test_asgi.app.<locals>.hi2"
assert event["request"]["env"] == {"REMOTE_ADDR": "testclient"}
assert set(event["request"]["headers"]) == {
Expand All @@ -87,7 +87,7 @@ def test_async_request_data(sentry_init, app, capture_events):
# Assert that state is not leaked
events.clear()
capture_message("foo")
event, = events
(event,) = events

assert "request" not in event
assert "transaction" not in event
Expand All @@ -106,12 +106,12 @@ def myerror(request):

assert response.status_code == 500

event, = events
(event,) = events
assert (
event["transaction"]
== "tests.integrations.asgi.test_asgi.test_errors.<locals>.myerror"
)
exception, = event["exception"]["values"]
(exception,) = event["exception"]["values"]

assert exception["type"] == "ValueError"
assert exception["value"] == "oh no"
Expand Down
12 changes: 6 additions & 6 deletions tests/integrations/aws_lambda/test_aws.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ def test_handler(event, context):

assert response["FunctionError"] == "Unhandled"

event, = events
(event,) = events
assert event["level"] == "error"
exception, = event["exception"]["values"]
(exception,) = event["exception"]["values"]
assert exception["type"] == "Exception"
assert exception["value"] == "something went wrong"

frame1, = exception["stacktrace"]["frames"]
(frame1,) = exception["stacktrace"]["frames"]
assert frame1["filename"] == "test_lambda.py"
assert frame1["abs_path"] == "/var/task/test_lambda.py"
assert frame1["function"] == "test_handler"
Expand Down Expand Up @@ -177,9 +177,9 @@ def test_handler(event, context):
b'{"foo": "bar"}',
)

event, = events
(event,) = events
assert event["level"] == "error"
exception, = event["exception"]["values"]
(exception,) = event["exception"]["values"]
assert exception["type"] == "Exception"
assert exception["value"] == "something went wrong"

Expand Down Expand Up @@ -222,7 +222,7 @@ def test_handler(event, context):
""",
)

event, = events
(event,) = events

assert event["request"] == {
"headers": {
Expand Down
4 changes: 2 additions & 2 deletions tests/integrations/beam/test_beam.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def test_invoker_exception(init_beam, capture_events, capture_exceptions, fn):
except Exception:
pass

event, = events
exception, = event["exception"]["values"]
(event,) = events
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"
assert exception["mechanism"]["type"] == "beam"
26 changes: 13 additions & 13 deletions tests/integrations/bottle/test_bottle.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_has_context(sentry_init, app, capture_events, get_client):
response = client.get("/message")
assert response[1] == "200 OK"

event, = events
(event,) = events
assert event["message"] == "hi"
assert "data" not in event["request"]
assert event["request"]["url"] == "http://localhost/message"
Expand Down Expand Up @@ -82,7 +82,7 @@ def test_transaction_style(
response = client.get("/message")
assert response[1] == "200 OK"

event, = events
(event,) = events
assert event["transaction"].endswith(expected_transaction)


Expand All @@ -109,10 +109,10 @@ def index():
except ZeroDivisionError:
pass

exc, = exceptions
(exc,) = exceptions
assert isinstance(exc, ZeroDivisionError)

event, = events
(event,) = events
assert event["exception"]["values"][0]["mechanism"]["type"] == "bottle"
assert event["exception"]["values"][0]["mechanism"]["handled"] is False

Expand All @@ -139,7 +139,7 @@ def index():
response = client.post("/", content_type="application/json", data=json.dumps(data))
assert response[1] == "200 OK"

event, = events
(event,) = events
assert event["_meta"]["request"]["data"]["foo"]["bar"] == {
"": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
}
Expand All @@ -166,7 +166,7 @@ def index():
response = client.post("/", content_type="application/json", data=json.dumps(data))
assert response[1] == "200 OK"

event, = events
(event,) = events
assert event["request"]["data"] == data


Expand All @@ -189,7 +189,7 @@ def index():
response = client.post("/", data=data)
assert response[1] == "200 OK"

event, = events
(event,) = events
assert event["_meta"]["request"]["data"]["foo"] == {
"": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
}
Expand Down Expand Up @@ -224,7 +224,7 @@ def index():
response = client.post("/", data=data)
assert response[1] == "200 OK"

event, = events
(event,) = events
assert event["_meta"]["request"]["data"] == {
"": {"len": 2000, "rem": [["!config", "x", 0, 2000]]}
}
Expand Down Expand Up @@ -254,7 +254,7 @@ def index():
response = client.post("/", data=data)
assert response[1] == "200 OK"

event, = events
(event,) = events
assert event["_meta"]["request"]["data"]["foo"] == {
"": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
}
Expand Down Expand Up @@ -321,7 +321,7 @@ def index():
client = get_client()
client.get("/")

event, = events
(event,) = events
assert event["level"] == "error"


Expand All @@ -343,11 +343,11 @@ def crashing_app(environ, start_response):
with pytest.raises(ZeroDivisionError) as exc:
client.get("/wsgi/")

error, = exceptions
(error,) = exceptions

assert error is exc.value

event, = events
(event,) = events
assert event["exception"]["values"][0]["mechanism"] == {
"type": "bottle",
"handled": False,
Expand Down Expand Up @@ -402,7 +402,7 @@ def error_handler(err):

event1, event2 = events

exception, = event1["exception"]["values"]
(exception,) = event1["exception"]["values"]
assert exception["type"] == "ValueError"

exception = event2["exception"]["values"][0]
Expand Down
12 changes: 6 additions & 6 deletions tests/integrations/celery/test_celery.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def dummy_task(x, y):
celery_invocation(dummy_task, 1, 2)
_, expected_context = celery_invocation(dummy_task, 1, 0)

event, = events
(event,) = events

assert event["contexts"]["trace"]["trace_id"] == span.trace_id
assert event["contexts"]["trace"]["span_id"] != span.span_id
Expand All @@ -88,7 +88,7 @@ def dummy_task(x, y):
task_name="dummy_task", **expected_context
)

exception, = event["exception"]["values"]
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"
assert exception["mechanism"]["type"] == "celery"
assert exception["stacktrace"]["frames"][0]["vars"]["foo"] == "42"
Expand Down Expand Up @@ -180,10 +180,10 @@ def dummy_task():
with Hub.current.start_span() as span:
dummy_task.delay()

event, = events
(event,) = events
assert event["contexts"]["trace"]["trace_id"] != span.trace_id
assert event["transaction"] == "dummy_task"
exception, = event["exception"]["values"]
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"


Expand Down Expand Up @@ -265,7 +265,7 @@ def dummy_task(self):
dummy_task.delay()

assert len(runs) == 3
event, = events
(event,) = events
exceptions = event["exception"]["values"]

for e in exceptions:
Expand Down Expand Up @@ -302,7 +302,7 @@ def dummy_task(self):
res.wait()

event = events.read_event()
exception, = event["exception"]["values"]
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"

events.read_flush()
Expand Down
4 changes: 2 additions & 2 deletions tests/integrations/django/asgi/test_asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ async def test_basic(sentry_init, capture_events, application):
response = await comm.get_response()
assert response["status"] == 500

event, = events
(event,) = events

exception, = event["exception"]["values"]
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"

# Test that the ASGI middleware got set up correctly. Right now this needs
Expand Down
Loading