CancelledError fix Ctrl C

Author: adev-code

aws-cli-main.py

@@ -28,6 +28,8 @@
 )
 from urllib3.util.url import parse_url
 
+from concurrent.futures import CancelledError
+
 try:
     from urllib3.util.ssl_ import OP_NO_TICKET, PROTOCOL_TLS_CLIENT
 except ImportError:
@@ -497,6 +499,8 @@ def send(self, request):
             raise ConnectionClosedError(
                 error=e, request=request, endpoint_url=request.url
             )
+        except CancelledError:
+            raise
         except Exception as e:
             message = 'Exception received when sending urllib3 HTTP request'
             logger.debug(message, exc_info=True)

aws-cli-mainII.py

@@ -18,6 +18,7 @@
     mask_proxy_url,
 )
 from urllib3.exceptions import NewConnectionError, ProtocolError, ProxyError
+from concurrent.futures import CancelledError
 
 from tests import mock, unittest
 
@@ -463,6 +464,12 @@ def test_catches_bad_status_line(self):
         with pytest.raises(ConnectionClosedError):
             self.make_request_with_error(error)
 
+    def test_catches_cancelled_error(self):
+        self.connection.urlopen.side_effect = CancelledError()
+        session = URLLib3Session()
+        with pytest.raises(CancelledError):
+            session.send(self.request.prepare())
+
     def test_catches_proxy_error(self):
         self.connection.urlopen.side_effect = ProxyError('test', None)
         session = URLLib3Session(