From 4e6c6ef5e884577e2d6533473274dc4f86382fd1 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Mon, 3 Aug 2020 18:09:16 -0500
Subject: newer pypy (#928)

* newer pypy

* missed one

* we don't support ancient cffi any more
---
 src/OpenSSL/_util.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'src/OpenSSL/_util.py')

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
-- 
cgit v1.2.1