Author: Philip Jenvey <pjen...@underboss.org> Branch: py3k Changeset: r73492:8fbe4a728f3e Date: 2014-09-11 15:57 -0700 http://bitbucket.org/pypy/pypy/changeset/8fbe4a728f3e/
Log: merge default 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 @@ -923,7 +923,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