From 8c1624a36096bf99d9130266592f7c77ef0c3bd7 Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@gmail.com>
Date: Wed, 22 Jan 2020 20:51:40 -0800
Subject: [PATCH] simplify no_except_close

---
 pywb/utils/io.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pywb/utils/io.py b/pywb/utils/io.py
index a659518d..7d217060 100644
--- a/pywb/utils/io.py
+++ b/pywb/utils/io.py
@@ -6,25 +6,22 @@ from warcio.limitreader import LimitReader
 from warcio.utils import BUFF_SIZE
 
 
+# =============================================================================
 def no_except_close(closable):
     """Attempts to call the close method of the
-    supplied object.
+    supplied object catching all exceptions.
+    Also tries to call release_conn() in case a requests raw stream
 
     :param closable: The object to be closed
     :rtype: None
     """
-    if not closable:
-        return
-
     try:
         closable.close()
     except Exception:
         pass
 
     try:
-        release_conn = getattr(closable, 'release_conn', None)
-        if release_conn is not None:
-            release_conn()
+        closable.release_conn()
     except Exception:
         pass