Fix use of GzipFile to not assume "with" protocol

This fixes a bunch of tests so they pass on squeeze, which has a version
of Python whose GzipFile doesn't support the "with" protocol.

2 files changed, 7 insertions, 5 deletions

diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 856587a2..565fdf4f 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -706,9 +706,10 @@ class DiskImageBuilder(SystemKindBuilder):  # pragma: no cover
                 self.app.status(msg='Compressing disk image',
                                 chatty=True)
                 with os.fdopen(image_file_fd, "rb") as ifh:
-                    with gzip.GzipFile(fileobj=handle, mode="wb",
-                                       compresslevel=1) as ofh:
-                        shutil.copyfileobj(ifh, ofh, 1024 * 1024)
+                    ofh = gzip.GzipFile(
+                        fileobj=handle, mode="wb", compresslevel=1)
+                    shutil.copyfileobj(ifh, ofh, 1024 * 1024)
+                    ofh.close()
 
             except:
                 os.remove(image_name)
diff --git a/morphlib/plugins/trebuchet_plugin.py b/morphlib/plugins/trebuchet_plugin.py
index 1c44bf29..4fa25e91 100644
--- a/morphlib/plugins/trebuchet_plugin.py
+++ b/morphlib/plugins/trebuchet_plugin.py
@@ -40,8 +40,9 @@ class MountableImage(object):
 
         try:
             with os.fdopen(tempfd, "wb") as outfh:
-                with gzip.open(path, "rb") as infh:
-                    morphlib.util.copyfileobj(infh, outfh)
+                infh = gzip.open(path, "rb")
+                morphlib.util.copyfileobj(infh, outfh)
+                infh.close()
         except:
             os.unlink(self.temp_path)
             raise