BIND 10 master, updated. c79031b28b835ccaf0d683b80ae877a5c94c12d4 [master] Fix exception types caught

[BIND 10 source code commits]

The branch, master has been updated
       via  c79031b28b835ccaf0d683b80ae877a5c94c12d4 (commit)
      from  6674553cc7932dee920e06a4936ba28916552e25 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c79031b28b835ccaf0d683b80ae877a5c94c12d4
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Aug 5 17:28:36 2013 +0530

    [master] Fix exception types caught

-----------------------------------------------------------------------

Summary of changes:
 src/bin/cmdctl/cmdctl.py.in         |    2 +-
 src/bin/cmdctl/tests/cmdctl_test.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/cmdctl/cmdctl.py.in b/src/bin/cmdctl/cmdctl.py.in
index 61c9eb7..0b402fe 100755
--- a/src/bin/cmdctl/cmdctl.py.in
+++ b/src/bin/cmdctl/cmdctl.py.in
@@ -604,7 +604,7 @@ class SecureHTTPServer(socketserver_mixin.NoPollMixIn,
             self.close_request(sock)
             logger.error(CMDCTL_SSL_SETUP_FAILURE_USER_DENIED, err)
             raise
-        except (CmdctlException, IOError) as cce:
+        except (CmdctlException, IOError, socket.error) as cce:
             self.close_request(sock)
             logger.error(CMDCTL_SSL_SETUP_FAILURE_READING_CERT, cce)
             raise
diff --git a/src/bin/cmdctl/tests/cmdctl_test.py b/src/bin/cmdctl/tests/cmdctl_test.py
index 3e72ea7..dfd66ad 100644
--- a/src/bin/cmdctl/tests/cmdctl_test.py
+++ b/src/bin/cmdctl/tests/cmdctl_test.py
@@ -737,7 +737,7 @@ class TestSecureHTTPServer(unittest.TestCase):
                           'no_such_file', 'no_such_file')
 
         # Using a non-certificate file would cause an SSLError
-        self.assertRaises(ssl.SSLError,
+        self.assertRaises(socket.error,
                           self.server._wrap_socket_in_ssl_context,
                           sock,
                           BUILD_FILE_PATH + 'cmdctl.py',
@@ -756,7 +756,7 @@ class TestSecureHTTPServer(unittest.TestCase):
         orig_check_func = self.server._check_key_and_cert
         try:
             self.server._check_key_and_cert = lambda x,y: None
-            self.assertRaises(socket.error,
+            self.assertRaises(IOError,
                               self.server._wrap_socket_in_ssl_context,
                               sock,
                               'no_such_file', 'no_such_file')