From 6e4c6281dbb7ee12bcdc22620894edb4e9cf623f Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 7 Sep 2017 08:16:21 -0400 Subject: Reverted "Fixed #27818 -- Replaced try/except/pass with contextlib.suppress()." This reverts commit 550cb3a365dee4edfdd1563224d5304de2a57fda because try/except performs better. --- django/http/response.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'django/http') diff --git a/django/http/response.py b/django/http/response.py index 384de9fb84..1083fd7dca 100644 --- a/django/http/response.py +++ b/django/http/response.py @@ -3,7 +3,6 @@ import json import re import sys import time -from contextlib import suppress from email.header import Header from http.client import responses from urllib.parse import urlparse @@ -137,8 +136,10 @@ class HttpResponseBase: self._headers[header.lower()] = (header, value) def __delitem__(self, header): - with suppress(KeyError): + try: del self._headers[header.lower()] + except KeyError: + pass def __getitem__(self, header): return self._headers[header.lower()][1] @@ -237,8 +238,10 @@ class HttpResponseBase: # See http://blog.dscpl.com.au/2012/10/obligations-for-calling-close-on.html def close(self): for closable in self._closable_objects: - with suppress(Exception): + try: closable.close() + except Exception: + pass self.closed = True signals.request_finished.send(sender=self._handler_class) @@ -304,8 +307,10 @@ class HttpResponse(HttpResponseBase): if hasattr(value, '__iter__') and not isinstance(value, (bytes, str)): content = b''.join(self.make_bytes(chunk) for chunk in value) if hasattr(value, 'close'): - with suppress(Exception): + try: value.close() + except Exception: + pass else: content = self.make_bytes(value) # Create a list of properly encoded bytestrings to support write(). -- cgit v1.3