[pypy-commit] pypy py3.5: _fs_decode(_str_from_buf(ffistr)) will never work (thanks armin)

plan_rich pypy.commits at gmail.com
Tue Jan 17 05:30:02 EST 2017


Author: Richard Plangger <planrichi at gmail.com>
Branch: py3.5
Changeset: r89628:7952b451d86c
Date: 2017-01-17 11:15 +0100
http://bitbucket.org/pypy/pypy/changeset/7952b451d86c/

Log:	_fs_decode(_str_from_buf(ffistr)) will never work (thanks armin)

diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
@@ -532,7 +532,7 @@
         short_name = lib.SSL_COMP_get_name(comp_method)
         if short_name == ffi.NULL:
             return None
-        return _fs_decode(_str_from_buf(short_name))
+        return _cstr_decode_fs(short_name)
 
     def version(self):
         if self.ssl == ffi.NULL:


More information about the pypy-commit mailing list