Python 3 imports for PyPy3 in lock.py. Fixes #866

changelog.rst

@@ -66,6 +66,8 @@ Platforms
   * SSLSocket.recv(0) or read(0) returns an empty byte string. This is
     a fix for `Python bug #23804 <http://bugs.python.org/issue23804>`_
     which has been merged into Python 2.7 and Python 3.
+- PyPy3 5.5.0 (supporting Python 3.3.5) is now tested and passes the
+  test suite. Thanks to btegs for :issue:`866`, XXX.
 
 Stdlib Compatibility
 --------------------

src/gevent/lock.py

@@ -23,8 +23,13 @@ __all__ = [
 # to use locks *other* than the one being traced.)
 if PYPY:
     # TODO: Need to use monkey.get_original?
-    from thread import allocate_lock as _allocate_lock # pylint:disable=import-error,useless-suppression
-    from thread import get_ident as _get_ident # pylint:disable=import-error,useless-suppression
+    try:
+        from _thread import allocate_lock as _allocate_lock # pylint:disable=import-error,useless-suppression
+        from _thread import get_ident as _get_ident # pylint:disable=import-error,useless-suppression
+    except ImportError:
+        # Python 2
+        from thread import allocate_lock as _allocate_lock # pylint:disable=import-error,useless-suppression
+        from thread import get_ident as _get_ident # pylint:disable=import-error,useless-suppression
     _sem_lock = _allocate_lock()
 
     def untraceable(f):