summaryrefslogtreecommitdiff
path: root/src/OpenSSL/_util.py
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2020-08-03 18:09:16 -0500
committerGitHub <noreply@github.com>2020-08-03 19:09:16 -0400
commit4e6c6ef5e884577e2d6533473274dc4f86382fd1 (patch)
tree90376236ed572aa97dd9d7153a1afa1711e80c59 /src/OpenSSL/_util.py
parentbeaf9f514ae9db428a17e96520111c27f3c330d9 (diff)
downloadpyopenssl-4e6c6ef5e884577e2d6533473274dc4f86382fd1.tar.gz
newer pypy (#928)
* newer pypy * missed one * we don't support ancient cffi any more
Diffstat (limited to 'src/OpenSSL/_util.py')
-rw-r--r--src/OpenSSL/_util.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/OpenSSL/_util.py b/src/OpenSSL/_util.py
index 1beefe6..d04244c 100644
--- a/src/OpenSSL/_util.py
+++ b/src/OpenSSL/_util.py
@@ -155,15 +155,4 @@ def text_to_bytes_and_warn(label, obj):
return obj
-try:
- # newer versions of cffi free the buffer deterministically
- with ffi.from_buffer(b""):
- pass
- from_buffer = ffi.from_buffer
-except AttributeError:
- # cffi < 0.12 frees the buffer with refcounting gc
- from contextlib import contextmanager
-
- @contextmanager
- def from_buffer(*args):
- yield ffi.from_buffer(*args)
+from_buffer = ffi.from_buffer