[pypy-commit] pypy py3k: fix from previous merge

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r72462:bab7e4800a77
Date: 2014-07-16 14:49 -0700
http://bitbucket.org/pypy/pypy/changeset/bab7e4800a77/

Log:	fix from previous merge

diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -433,9 +433,9 @@
                 err = libssl_SSL_get_error(self.ssl, count)
 
                 if err == SSL_ERROR_WANT_READ:
-                    sockstate = checkwait(space, self.w_socket, False)
+                    sockstate = checkwait(space, w_socket, False)
                 elif err == SSL_ERROR_WANT_WRITE:
-                    sockstate = checkwait(space, self.w_socket, True)
+                    sockstate = checkwait(space, w_socket, True)
                 elif (err == SSL_ERROR_ZERO_RETURN and
                    libssl_SSL_get_shutdown(self.ssl) == SSL_RECEIVED_SHUTDOWN):
                     if space.is_none(w_buf):
@@ -462,7 +462,7 @@
 
         if rwbuffer is not None:
             rwbuffer.setslice(0, result)
-            return self.space.wrap(count)
+            return space.wrap(count)
         else:
             return space.wrapbytes(result)