Skip to content

Commit

Permalink
Fixed mypy issues
Browse files Browse the repository at this point in the history
  • Loading branch information
cdeler committed Sep 17, 2020
1 parent 55e5207 commit 586debb
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
14 changes: 8 additions & 6 deletions httpcore/_async/connection.py
Expand Up @@ -201,35 +201,37 @@ async def _open_socket(self, timeout: TimeoutDict = None) -> AsyncSocketStream:
local_address=self.local_address,
)

request = socks5.SOCKS5AuthMethodsRequest(
auth_request = socks5.SOCKS5AuthMethodsRequest(
[
socks5.SOCKS5AuthMethod.NO_AUTH_REQUIRED,
socks5.SOCKS5AuthMethod.USERNAME_PASSWORD,
]
)

self.proxy_connection.send(request)
self.proxy_connection.send(auth_request)

bytes_to_send = self.proxy_connection.data_to_send()
await proxy_socket.write(bytes_to_send, timeout)

data = await proxy_socket.read(1024, timeout)
event = self.proxy_connection.receive_data(data)

assert event.method == socks5.SOCKS5AuthMethod.NO_AUTH_REQUIRED
# development only assert
assert event.method == socks5.SOCKS5AuthMethod.NO_AUTH_REQUIRED # type: ignore

request = socks5.SOCKS5CommandRequest.from_address(
connect_request = socks5.SOCKS5CommandRequest.from_address(
socks5.SOCKS5Command.CONNECT, (hostname, port)
)

self.proxy_connection.send(request)
self.proxy_connection.send(connect_request)
bytes_to_send = self.proxy_connection.data_to_send()

await proxy_socket.write(bytes_to_send, timeout)
data = await proxy_socket.read(1024, timeout)
event = self.proxy_connection.receive_data(data)

assert event.reply_code == socks5.SOCKS5ReplyCode.SUCCEEDED
# development only assert
assert event.reply_code == socks5.SOCKS5ReplyCode.SUCCEEDED # type: ignore

if ssl_context:
proxy_socket = await proxy_socket.start_tls(hostname, ssl_context, timeout)
Expand Down
14 changes: 8 additions & 6 deletions httpcore/_sync/connection.py
Expand Up @@ -201,35 +201,37 @@ def _open_socket(self, timeout: TimeoutDict = None) -> SyncSocketStream:
local_address=self.local_address,
)

request = socks5.SOCKS5AuthMethodsRequest(
auth_request = socks5.SOCKS5AuthMethodsRequest(
[
socks5.SOCKS5AuthMethod.NO_AUTH_REQUIRED,
socks5.SOCKS5AuthMethod.USERNAME_PASSWORD,
]
)

self.proxy_connection.send(request)
self.proxy_connection.send(auth_request)

bytes_to_send = self.proxy_connection.data_to_send()
proxy_socket.write(bytes_to_send, timeout)

data = proxy_socket.read(1024, timeout)
event = self.proxy_connection.receive_data(data)

assert event.method == socks5.SOCKS5AuthMethod.NO_AUTH_REQUIRED
# development only assert
assert event.method == socks5.SOCKS5AuthMethod.NO_AUTH_REQUIRED # type: ignore

request = socks5.SOCKS5CommandRequest.from_address(
connect_request = socks5.SOCKS5CommandRequest.from_address(
socks5.SOCKS5Command.CONNECT, (hostname, port)
)

self.proxy_connection.send(request)
self.proxy_connection.send(connect_request)
bytes_to_send = self.proxy_connection.data_to_send()

proxy_socket.write(bytes_to_send, timeout)
data = proxy_socket.read(1024, timeout)
event = self.proxy_connection.receive_data(data)

assert event.reply_code == socks5.SOCKS5ReplyCode.SUCCEEDED
# development only assert
assert event.reply_code == socks5.SOCKS5ReplyCode.SUCCEEDED # type: ignore

if ssl_context:
proxy_socket = proxy_socket.start_tls(hostname, ssl_context, timeout)
Expand Down

0 comments on commit 586debb

Please sign in to comment.