diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2014-01-10 14:06:04 -0500 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2014-01-10 14:06:04 -0500 |
| commit | 9b4115fdb1309fce2362e10b66a17234779487bb (patch) | |
| tree | 2b98087b264f9d27fad113f8ca230fc5e8bceda0 | |
| parent | dc513fa80322ae17f4e275e398ca331de14df8f2 (diff) | |
| download | pyopenssl-9b4115fdb1309fce2362e10b66a17234779487bb.tar.gz | |
Obey the Python 3 exception variable handling rules
| -rw-r--r-- | OpenSSL/crypto.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSSL/crypto.py b/OpenSSL/crypto.py index 0c78b31..c2180d0 100644 --- a/OpenSSL/crypto.py +++ b/OpenSSL/crypto.py @@ -1926,10 +1926,10 @@ class _PassphraseHelper(object): try: _exception_from_error_queue(exceptionType) except exceptionType as e: - pass + from_queue = e if self._problems: raise self._problems[0] - return e + return from_queue def _read_passphrase(self, buf, size, rwflag, userdata): |