summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2023-02-13 13:01:47 +0100
committerGitHub <noreply@github.com>2023-02-13 07:01:47 -0500
commit669969ea7afa8a5f5f35a784a50acef9bea3952a (patch)
tree768460b6115d6179418554ca1d8ac5959a8a21d3
parent23d990e95812c45c9a0ee1fc9b501a90ae9425aa (diff)
downloadpyopenssl-669969ea7afa8a5f5f35a784a50acef9bea3952a.tar.gz
Fix CI (#1185)
* Reformat code using black 23.x * fix compat with tox 4
-rw-r--r--src/OpenSSL/SSL.py1
-rw-r--r--src/OpenSSL/crypto.py2
-rw-r--r--tests/test_ssl.py3
-rw-r--r--tox.ini2
4 files changed, 3 insertions, 5 deletions
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index dfbd109..c1fb0f5 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -1916,7 +1916,6 @@ class Connection:
buf = _text_to_bytes_and_warn("buf", buf)
with _ffi.from_buffer(buf) as data:
-
left_to_send = len(buf)
total_sent = 0
diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py
index a9b673c..8b12769 100644
--- a/src/OpenSSL/crypto.py
+++ b/src/OpenSSL/crypto.py
@@ -2556,7 +2556,6 @@ class CRL:
class PKCS7:
-
_pkcs7: Any
def type_is_signed(self) -> bool:
@@ -2920,7 +2919,6 @@ class _PassphraseHelper:
def raise_if_problem(self, exceptionType: Type[Exception] = Error) -> None:
if self._problems:
-
# Flush the OpenSSL error queue
try:
_exception_from_error_queue(exceptionType)
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index a3617c7..bfc5ca8 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -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)
diff --git a/tox.ini b/tox.ini
index 374ac2c..5e00317 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,8 @@ passenv =
PATH
LD_LIBRARY_PATH
TERM
+ RUSTUP_TOOLCHAIN
+ RUSTUP_HOME
extras =
test
deps =