Author: Philip Jenvey <pjen...@underboss.org> Branch: py3.3 Changeset: r73493:6a2b74eae1e7 Date: 2014-09-11 15:57 -0700 http://bitbucket.org/pypy/pypy/changeset/6a2b74eae1e7/
Log: merge py3k 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 @@ -930,7 +930,7 @@ else: r, w, e = rpoll.select([sock_fd], [], [], sock_timeout) ready = r - except SelectError, e: + except rpoll.SelectError as e: message = e.get_msg() raise ssl_error(space, message, e.errno) if ready: _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit