diff options
Diffstat (limited to 'python/qpid/framer.py')
| -rw-r--r-- | python/qpid/framer.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/python/qpid/framer.py b/python/qpid/framer.py index 47f57cf649..8e4ef014f1 100644 --- a/python/qpid/framer.py +++ b/python/qpid/framer.py @@ -51,9 +51,10 @@ class Framer(Packer): self.sock_lock.acquire() try: if self.security_layer_tx: - status, cipher_buf = self.security_layer_tx.encode(self.tx_buf) - if status == False: - raise Closed(self.security_layer_tx.getError()) + try: + cipher_buf = self.security_layer_tx.encode(self.tx_buf) + except SASLError, e: + raise Closed(str(e)) self._write(cipher_buf) else: self._write(self.tx_buf) @@ -91,9 +92,10 @@ class Framer(Packer): try: s = self.sock.recv(n) # NOTE: instead of "n", arg should be "self.maxbufsize" if self.security_layer_rx: - status, s = self.security_layer_rx.decode(s) - if status == False: - raise Closed(self.security_layer_tx.getError()) + try: + s = self.security_layer_rx.decode(s) + except SASLError, e: + raise Closed(str(e)) except socket.timeout: if self.aborted(): raise Closed() |