Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0A77FD79D for ; Thu, 23 May 2013 14:39:33 +0000 (UTC) Received: (qmail 87174 invoked by uid 500); 23 May 2013 14:39:32 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 87131 invoked by uid 500); 23 May 2013 14:39:31 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 87107 invoked by uid 99); 23 May 2013 14:39:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 May 2013 14:39:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 May 2013 14:39:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 598A623888D2; Thu, 23 May 2013 14:39:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1485741 - /qpid/trunk/qpid/python/qpid/messaging/transports.py Date: Thu, 23 May 2013 14:39:10 -0000 To: commits@qpid.apache.org From: kgiusti@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130523143910.598A623888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kgiusti Date: Thu May 23 14:39:10 2013 New Revision: 1485741 URL: http://svn.apache.org/r1485741 Log: QPID-4882: use correct exception object for older ssl implemenations Modified: qpid/trunk/qpid/python/qpid/messaging/transports.py Modified: qpid/trunk/qpid/python/qpid/messaging/transports.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging/transports.py?rev=1485741&r1=1485740&r2=1485741&view=diff ============================================================================== --- qpid/trunk/qpid/python/qpid/messaging/transports.py (original) +++ qpid/trunk/qpid/python/qpid/messaging/transports.py Thu May 23 14:39:10 2013 @@ -76,7 +76,7 @@ except ImportError: # supplied CA certs. Since this version cannot validate, the peer cannot # be trusted. if conn.ssl_trustfile: - raise SSLError("This version of Python does not support verification of the peer's certificate.") + raise socket.error("This version of Python does not support verification of the peer's certificate.") self.ssl = ssl(self.socket, keyfile=ssl_keyfile, certfile=ssl_certfile) self.socket.setblocking(1) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org