Merge lp:~mthaddon/codetree/requests-contextlib-1884297 into lp:codetree

[Tom Haddon]

Add a closing wrapper for requests.get per LP:1884297

Add a closing wrapper for requests.get per lp#1884297

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Guillermo Gonzalez (verterok)]

+1

review: Approve

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 121

=== modified file 'codetree/handlers/charm.py'
--- codetree/handlers/charm.py	2020-04-08 09:58:38 +0000
+++ codetree/handlers/charm.py	2020-06-22 14:39:30 +0000
@@ -1,6 +1,5 @@
 from __future__ import division, print_function
 import hashlib
-from io import open
 import json
 import logging
 import os
@@ -9,6 +8,8 @@
 import subprocess
 import tempfile
 import sys
+from contextlib import closing
+from io import open
 
 from .basic import HandlerResult, SourceHandler
 from .exceptions import InvalidOption, NoSuchCharm
@@ -160,7 +161,9 @@
         url = "{0}/{1}/archive".format(self.base_url, self.charmstore_url)
         zip_path = os.path.join(download_dir, 'charm.zip')
         calculated_hash = hashlib.new("sha384")
-        with open(zip_path, 'wb') as charm_file, requests.get(url) as req:
+        # Note that we need the `closing` wrapper for requests.get as it isn't
+        # a true context manager in python3.4. See LP#1884297.
+        with open(zip_path, 'wb') as charm_file, closing(requests.get(url)) as req:
             for chunk in req.iter_content(8192):
                 charm_file.write(chunk)
                 calculated_hash.update(six.ensure_binary(chunk))
 
=== modified file 'tests/test_charm_handler.py'
--- tests/test_charm_handler.py	2020-04-08 09:27:18 +0000
+++ tests/test_charm_handler.py	2020-06-22 14:39:30 +0000
@@ -58,6 +58,9 @@
     def __exit__(self, exc_type, exc_val, exc_tb):
         pass
 
+    def close(self):
+        pass
+
     @property
     def content(self):
         if isinstance(self._content, six.BytesIO):