don't leak file descriptor (#81)

mbr · Oct 22, 2018 · e2860ea · e2860ea
1 parent 83b817a
commit e2860ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -1,6 +1,11 @@
 Changelog
 *********
 
+Next
+====
+
+* Fix file-descriptor leak in `KeyValueStore._get_file`
+
 0.11.10
 =======
 

diff --git a/simplekv/__init__.py b/simplekv/__init__.py
@@ -227,12 +227,15 @@ def _get_file(self, key, file):
         # this allows us to support file-like objects without close as well,
         # such as BytesIO.
         source = self.open(key)
-        while True:
-            buf = source.read(bufsize)
-            file.write(buf)
-
-            if len(buf) < bufsize:
-                break
+        try:
+            while True:
+                buf = source.read(bufsize)
+                file.write(buf)
+
+                if len(buf) < bufsize:
+                    break
+        finally:
+            source.close()
 
     def _get_filename(self, key, filename):
         """Write key to file. Either this method or