Author: Matti Picus <matti.pi...@gmail.com> Branch: py3.6 Changeset: r96700:3ddfc6aee731 Date: 2019-05-27 14:18 +0300 http://bitbucket.org/pypy/pypy/changeset/3ddfc6aee731/
Log: fix merge diff --git a/lib_pypy/_cffi_ssl/_stdssl/error.py b/lib_pypy/_cffi_ssl/_stdssl/error.py --- a/lib_pypy/_cffi_ssl/_stdssl/error.py +++ b/lib_pypy/_cffi_ssl/_stdssl/error.py @@ -1,5 +1,6 @@ import sys import os +import socket import traceback from _pypy_openssl import ffi from _pypy_openssl import lib _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
