Skip to content

Commit 162a554

Browse files
kristapraticokristapratico
authored
black update core (#35171)
* update black azure-core * update black corehttp * black all of core with the latest version * revert tox.ini
1 parent 73fca86 commit 162a554

File tree

16 files changed

+100
-99
lines changed

16 files changed

+100
-99
lines changed

‎sdk/core/azure-core-tracing-opencensus/azure/core/tracing/ext/opencensus_span/__init__.py‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,27 @@ def __init__(self, span: Optional[Span] = None, name: Optional[str] = "span", **
5656
kind: Optional[SpanKind] = (
5757
OpenCensusSpanKind.CLIENT
5858
if value == SpanKind.CLIENT
59-
else OpenCensusSpanKind.CLIENT
60-
if value == SpanKind.PRODUCER
61-
else OpenCensusSpanKind.SERVER # No producer in opencensus
62-
if value == SpanKind.SERVER
63-
else OpenCensusSpanKind.CLIENT
64-
if value == SpanKind.CONSUMER
65-
else OpenCensusSpanKind.UNSPECIFIED # No consumer in opencensus
66-
if value == SpanKind.INTERNAL
67-
else OpenCensusSpanKind.UNSPECIFIED # No internal in opencensus
68-
if value == SpanKind.UNSPECIFIED
69-
else None
59+
else (
60+
OpenCensusSpanKind.CLIENT
61+
if value == SpanKind.PRODUCER
62+
else (
63+
OpenCensusSpanKind.SERVER # No producer in opencensus
64+
if value == SpanKind.SERVER
65+
else (
66+
OpenCensusSpanKind.CLIENT
67+
if value == SpanKind.CONSUMER
68+
else (
69+
OpenCensusSpanKind.UNSPECIFIED # No consumer in opencensus
70+
if value == SpanKind.INTERNAL
71+
else (
72+
OpenCensusSpanKind.UNSPECIFIED # No internal in opencensus
73+
if value == SpanKind.UNSPECIFIED
74+
else None
75+
)
76+
)
77+
)
78+
)
79+
)
7080
)
7181
if value and kind is None:
7282
raise ValueError("Kind {} is not supported in OpenCensus".format(value))
@@ -128,11 +138,11 @@ def kind(self) -> Optional[SpanKind]:
128138
return (
129139
SpanKind.CLIENT
130140
if value == OpenCensusSpanKind.CLIENT
131-
else SpanKind.SERVER
132-
if value == OpenCensusSpanKind.SERVER
133-
else SpanKind.UNSPECIFIED
134-
if value == OpenCensusSpanKind.UNSPECIFIED
135-
else None
141+
else (
142+
SpanKind.SERVER
143+
if value == OpenCensusSpanKind.SERVER
144+
else SpanKind.UNSPECIFIED if value == OpenCensusSpanKind.UNSPECIFIED else None
145+
)
136146
)
137147

138148
@kind.setter

‎sdk/core/azure-core-tracing-opentelemetry/azure/core/tracing/ext/opentelemetry_span/__init__.py‎

Lines changed: 47 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,23 @@ def __init__(self, span: Optional[Span] = None, name: Optional[str] = "span", **
8080
otel_kind = (
8181
OpenTelemetrySpanKind.CLIENT
8282
if span_kind == SpanKind.CLIENT
83-
else OpenTelemetrySpanKind.PRODUCER
84-
if span_kind == SpanKind.PRODUCER
85-
else OpenTelemetrySpanKind.SERVER
86-
if span_kind == SpanKind.SERVER
87-
else OpenTelemetrySpanKind.CONSUMER
88-
if span_kind == SpanKind.CONSUMER
89-
else OpenTelemetrySpanKind.INTERNAL
90-
if span_kind == SpanKind.INTERNAL
91-
else OpenTelemetrySpanKind.INTERNAL
92-
if span_kind == SpanKind.UNSPECIFIED
93-
else None
83+
else (
84+
OpenTelemetrySpanKind.PRODUCER
85+
if span_kind == SpanKind.PRODUCER
86+
else (
87+
OpenTelemetrySpanKind.SERVER
88+
if span_kind == SpanKind.SERVER
89+
else (
90+
OpenTelemetrySpanKind.CONSUMER
91+
if span_kind == SpanKind.CONSUMER
92+
else (
93+
OpenTelemetrySpanKind.INTERNAL
94+
if span_kind == SpanKind.INTERNAL
95+
else OpenTelemetrySpanKind.INTERNAL if span_kind == SpanKind.UNSPECIFIED else None
96+
)
97+
)
98+
)
99+
)
94100
)
95101
if span_kind and otel_kind is None:
96102
raise ValueError("Kind {} is not supported in OpenTelemetry".format(span_kind))
@@ -165,15 +171,19 @@ def kind(self) -> Optional[SpanKind]:
165171
return (
166172
SpanKind.CLIENT
167173
if value == OpenTelemetrySpanKind.CLIENT
168-
else SpanKind.PRODUCER
169-
if value == OpenTelemetrySpanKind.PRODUCER
170-
else SpanKind.SERVER
171-
if value == OpenTelemetrySpanKind.SERVER
172-
else SpanKind.CONSUMER
173-
if value == OpenTelemetrySpanKind.CONSUMER
174-
else SpanKind.INTERNAL
175-
if value == OpenTelemetrySpanKind.INTERNAL
176-
else None
174+
else (
175+
SpanKind.PRODUCER
176+
if value == OpenTelemetrySpanKind.PRODUCER
177+
else (
178+
SpanKind.SERVER
179+
if value == OpenTelemetrySpanKind.SERVER
180+
else (
181+
SpanKind.CONSUMER
182+
if value == OpenTelemetrySpanKind.CONSUMER
183+
else SpanKind.INTERNAL if value == OpenTelemetrySpanKind.INTERNAL else None
184+
)
185+
)
186+
)
177187
)
178188

179189
@kind.setter
@@ -186,17 +196,23 @@ def kind(self, value: SpanKind) -> None:
186196
kind = (
187197
OpenTelemetrySpanKind.CLIENT
188198
if value == SpanKind.CLIENT
189-
else OpenTelemetrySpanKind.PRODUCER
190-
if value == SpanKind.PRODUCER
191-
else OpenTelemetrySpanKind.SERVER
192-
if value == SpanKind.SERVER
193-
else OpenTelemetrySpanKind.CONSUMER
194-
if value == SpanKind.CONSUMER
195-
else OpenTelemetrySpanKind.INTERNAL
196-
if value == SpanKind.INTERNAL
197-
else OpenTelemetrySpanKind.INTERNAL
198-
if value == SpanKind.UNSPECIFIED
199-
else None
199+
else (
200+
OpenTelemetrySpanKind.PRODUCER
201+
if value == SpanKind.PRODUCER
202+
else (
203+
OpenTelemetrySpanKind.SERVER
204+
if value == SpanKind.SERVER
205+
else (
206+
OpenTelemetrySpanKind.CONSUMER
207+
if value == SpanKind.CONSUMER
208+
else (
209+
OpenTelemetrySpanKind.INTERNAL
210+
if value == SpanKind.INTERNAL
211+
else OpenTelemetrySpanKind.INTERNAL if value == SpanKind.UNSPECIFIED else None
212+
)
213+
)
214+
)
215+
)
200216
)
201217
if kind is None:
202218
raise ValueError("Kind {} is not supported in OpenTelemetry".format(value))

‎sdk/core/azure-core/azure/core/exceptions.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,12 @@ class _HttpResponseCommonAPI(Protocol):
112112
"""
113113

114114
@property
115-
def reason(self) -> Optional[str]:
116-
...
115+
def reason(self) -> Optional[str]: ...
117116

118117
@property
119-
def status_code(self) -> Optional[int]:
120-
...
118+
def status_code(self) -> Optional[int]: ...
121119

122-
def text(self) -> str:
123-
...
120+
def text(self) -> str: ...
124121

125122
@property
126123
def request(self) -> object: # object as type, since all we need is str() on it

‎sdk/core/azure-core/azure/core/pipeline/__init__.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,10 @@ def update( # pylint: disable=docstring-missing-return, docstring-missing-rtype
112112
raise TypeError("Context objects cannot be updated.")
113113

114114
@overload
115-
def pop(self, __key: str) -> Any:
116-
...
115+
def pop(self, __key: str) -> Any: ...
117116

118117
@overload
119-
def pop(self, __key: str, __default: Optional[Any]) -> Any:
120-
...
118+
def pop(self, __key: str, __default: Optional[Any]) -> Any: ...
121119

122120
def pop(self, *args: Any) -> Any:
123121
"""Removes specified key and returns the value.

‎sdk/core/azure-core/azure/core/pipeline/_tools_async.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@
3434

3535

3636
@overload
37-
async def await_result(func: Callable[P, Awaitable[T]], *args: P.args, **kwargs: P.kwargs) -> T:
38-
...
37+
async def await_result(func: Callable[P, Awaitable[T]], *args: P.args, **kwargs: P.kwargs) -> T: ...
3938

4039

4140
@overload
42-
async def await_result(func: Callable[P, T], *args: P.args, **kwargs: P.kwargs) -> T:
43-
...
41+
async def await_result(func: Callable[P, T], *args: P.args, **kwargs: P.kwargs) -> T: ...
4442

4543

4644
async def await_result(func: Callable[P, Union[T, Awaitable[T]]], *args: P.args, **kwargs: P.kwargs) -> T:

‎sdk/core/azure-core/azure/core/pipeline/policies/_universal.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ def on_request(self, request: PipelineRequest[HTTPRequestType]) -> None:
263263

264264

265265
class NetworkTraceLoggingPolicy(SansIOHTTPPolicy[HTTPRequestType, HTTPResponseType]):
266-
267266
"""The logging policy in the pipeline is used to output HTTP network trace to the configured logger.
268267
269268
This accepts both global configuration, and per-request level with "enable_http_logger"

‎sdk/core/azure-core/azure/core/pipeline/transport/_aiohttp.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,7 @@ def __init__(
351351
response: AioHttpTransportResponse,
352352
*,
353353
decompress: bool = True,
354-
) -> None:
355-
...
354+
) -> None: ...
356355

357356
@overload
358357
def __init__(
@@ -361,8 +360,7 @@ def __init__(
361360
response: RestAioHttpTransportResponse,
362361
*,
363362
decompress: bool = True,
364-
) -> None:
365-
...
363+
) -> None: ...
366364

367365
def __init__(
368366
self,

‎sdk/core/azure-core/azure/core/rest/_rest_py3.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -332,16 +332,13 @@ class HttpResponse(_HttpResponseBase):
332332
"""
333333

334334
@abc.abstractmethod
335-
def __enter__(self) -> "HttpResponse":
336-
...
335+
def __enter__(self) -> "HttpResponse": ...
337336

338337
@abc.abstractmethod
339-
def __exit__(self, *args: Any) -> None:
340-
...
338+
def __exit__(self, *args: Any) -> None: ...
341339

342340
@abc.abstractmethod
343-
def close(self) -> None:
344-
...
341+
def close(self) -> None: ...
345342

346343
@abc.abstractmethod
347344
def read(self) -> bytes:
@@ -418,5 +415,4 @@ async def iter_bytes(self, **kwargs: Any) -> AsyncIterator[bytes]:
418415
yield # pylint: disable=unreachable
419416

420417
@abc.abstractmethod
421-
async def close(self) -> None:
422-
...
418+
async def close(self) -> None: ...

‎sdk/core/azure-core/tests/async_tests/test_rest_stream_responses_async.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ async def test_iter_with_error(client):
5151

5252
request = HttpRequest("GET", "http://doesNotExist")
5353
with pytest.raises(ServiceRequestError):
54-
async with (await client.send_request(request, stream=True)):
54+
async with await client.send_request(request, stream=True):
5555
raise ValueError("Should error before entering")
5656
assert response.is_closed
5757

‎sdk/core/azure-core/tests/test_rest_request_backcompat.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ def test_request_streamed_data_body(old_request, new_request):
130130
assert old_request.files == new_request.files == None
131131
assert old_request.data == new_request.data == None
132132
old_request.files = new_request.files = "foo"
133+
133134
# passing in iterable
134135
def streaming_body(data):
135136
yield data # pragma: nocover

0 commit comments

Comments
 (0)