[pypy-commit] pypy py3.6: fix merge

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r96667:385db1f245d0
Date: 2019-05-24 10:05 +0300
http://bitbucket.org/pypy/pypy/changeset/385db1f245d0/

Log:	fix merge

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
@@ -1,6 +1,6 @@
 import sys
 import time
-import thread as _thread
+import _thread
 import weakref
 from _pypy_openssl import ffi
 from _pypy_openssl import lib
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,7 +1,6 @@
 import sys
 import os
 import traceback
-(??)
 from _pypy_openssl import ffi
 from _pypy_openssl import lib