Author: Richard Plangger <[email protected]>
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:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
