Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix CI #1185

Merged
merged 2 commits into from
Feb 13, 2023
Merged

Fix CI #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41062de
Reformat code using black 23.x
mhils Feb 13, 2023
f27033d
fix compat with tox 4
mhils Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion src/OpenSSL/SSL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1916,7 +1916,6 @@ def sendall(self, buf, flags=0):
buf = _text_to_bytes_and_warn("buf", buf)

with _ffi.from_buffer(buf) as data:

left_to_send = len(buf)
total_sent = 0

Expand Down
2 changes: 0 additions & 2 deletions src/OpenSSL/crypto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2556,7 +2556,6 @@ def export(


class PKCS7:

_pkcs7: Any

def type_is_signed(self) -> bool:
Expand Down Expand Up @@ -2920,7 +2919,6 @@ def callback_args(self) -> Any:

def raise_if_problem(self, exceptionType: Type[Exception] = Error) -> None:
if self._problems:

# Flush the OpenSSL error queue
try:
_exception_from_error_queue(exceptionType)
Expand Down
3 changes: 1 addition & 2 deletions tests/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,11 +359,10 @@ def interact_in_memory(client_conn, server_conn):

# Copy stuff from each side's send buffer to the other side's
# receive buffer.
for (read, write) in [
for read, write in [
(client_conn, server_conn),
(server_conn, client_conn),
]:

# Give the side a chance to generate some more bytes, or succeed.
try:
data = read.recv(2**16)
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ passenv =
PATH
LD_LIBRARY_PATH
TERM
RUSTUP_TOOLCHAIN
RUSTUP_HOME
extras =
test
deps =
Expand Down