Skip to content

Commit c09fc86

Browse files
authored
DeepSource: Code quality issues (#523)
1 parent c482321 commit c09fc86

File tree

8 files changed

+40
-13
lines changed

8 files changed

+40
-13
lines changed

.deepsource.toml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
version = 1
2+
3+
test_patterns = [
4+
"tests/**",
5+
"**/test_*.py"
6+
]
7+
8+
exclude_patterns = [
9+
"helper/**",
10+
"menubar/**"
11+
]
12+
13+
[[analyzers]]
14+
name = "python"
15+
enabled = true
16+
17+
[analyzers.meta]
18+
runtime_version = "3.x.x"
19+
20+
[[analyzers]]
21+
name = "javascript"
22+
enabled = true
23+
24+
[analyzers.meta]
25+
environment = [
26+
"nodejs",
27+
"browser"
28+
]
29+
dialect = "typescript"

proxy/core/acceptor/threadless.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def selected_events(self) -> Generator[Tuple[Readables, Writables],
7979
if mask & selectors.EVENT_WRITE:
8080
writables.append(key.fileobj)
8181
yield (readables, writables)
82-
for fd in events.keys():
82+
for fd in events:
8383
self.selector.unregister(fd)
8484

8585
async def handle_events(

proxy/http/chunk_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def __init__(self) -> None:
3333
self.size: Optional[int] = None
3434

3535
def parse(self, raw: bytes) -> bytes:
36-
more = True if len(raw) > 0 else False
36+
more = len(raw) > 0
3737
while more and self.state != chunkParserStates.COMPLETE:
3838
more, raw = self.process(raw)
3939
return raw

proxy/http/handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ def selected_events(self) -> \
330330
if mask & selectors.EVENT_WRITE:
331331
writables.append(key.fileobj)
332332
yield (readables, writables)
333-
for fd in events.keys():
333+
for fd in events:
334334
self.selector.unregister(fd)
335335

336336
def run_once(self) -> bool:

proxy/http/parser.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def __init__(self, parser_type: int) -> None:
5151
# Buffer to hold unprocessed bytes
5252
self.buffer: bytes = b''
5353

54-
self.headers: Dict[bytes, Tuple[bytes, bytes]] = dict()
54+
self.headers: Dict[bytes, Tuple[bytes, bytes]] = {}
5555
self.body: Optional[bytes] = None
5656

5757
self.method: Optional[bytes] = None
@@ -146,7 +146,7 @@ def parse(self, raw: bytes) -> None:
146146
raw = self.buffer + raw
147147
self.buffer = b''
148148

149-
more = True if len(raw) > 0 else False
149+
more = len(raw) > 0
150150
while more and self.state != httpParserStates.COMPLETE:
151151
if self.state in (
152152
httpParserStates.HEADERS_COMPLETE,
@@ -265,7 +265,7 @@ def build_response(self) -> bytes:
265265

266266
def has_upstream_server(self) -> bool:
267267
"""Host field SHOULD be None for incoming local WebServer requests."""
268-
return True if self.host is not None else False
268+
return self.host is not None
269269

270270
def is_http_1_1_keep_alive(self) -> bool:
271271
return self.version == HTTP_1_1 and \

proxy/http/proxy/server.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ def read_from_descriptors(self, r: Readables) -> bool:
185185
'%s:%d timed out on recv' %
186186
self.server.addr)
187187
return True
188-
else:
189-
raise e
188+
raise e
190189
except ssl.SSLWantReadError: # Try again later
191190
# logger.warning('SSLWantReadError encountered while reading from server, will retry ...')
192191
return False
@@ -196,7 +195,7 @@ def read_from_descriptors(self, r: Readables) -> bool:
196195
'%s:%d unreachable on recv' %
197196
self.server.addr)
198197
return True
199-
elif e.errno == errno.ECONNRESET:
198+
if e.errno == errno.ECONNRESET:
200199
logger.warning('Connection reset by upstream: %r' % e)
201200
else:
202201
logger.exception(
@@ -315,8 +314,7 @@ def on_client_data(self, raw: memoryview) -> Optional[memoryview]:
315314
else:
316315
self.server.queue(raw)
317316
return None
318-
else:
319-
return raw
317+
return raw
320318

321319
def on_request_complete(self) -> Union[socket.socket, bool]:
322320
if not self.request.has_upstream_server():

proxy/http/server/web.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ def on_client_data(self, raw: memoryview) -> Optional[memoryview]:
207207
return None
208208
# If 1st valid request was completed and it's a HTTP/1.1 keep-alive
209209
# And only if we have a route, parse pipeline requests
210-
elif self.request.state == httpParserStates.COMPLETE and \
210+
if self.request.state == httpParserStates.COMPLETE and \
211211
self.request.is_http_1_1_keep_alive() and \
212212
self.route is not None:
213213
if self.pipeline_request is None:

tests/http/test_http_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def test_get_partial_parse1(self) -> None:
187187
self.parser.parse(host_hdr)
188188
self.assertEqual(self.parser.total_size,
189189
len(pkt) + len(CRLF) + len(host_hdr))
190-
self.assertDictEqual(self.parser.headers, dict())
190+
self.assertDictEqual(self.parser.headers, {})
191191
self.assertEqual(self.parser.buffer, b'Host: localhost:8080')
192192
self.assertEqual(self.parser.state, httpParserStates.LINE_RCVD)
193193

0 commit comments

Comments
 (0)