Merge pull request #306 from RonnyPfannschmidt/fix-305

fix #305 - close fd in the git archive handling

2 files changed, 24 insertions, 11 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6cea125..aa17219 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+
+* fix #305 - ensure the git file finder closes filedescriptors even when errors happen
+
+
+v3.3.3
+======
+
+* add eggs  for python3.7 and 3.8 to the deploy
+
 v3.3.2
 ======
 
diff --git a/src/setuptools_scm/file_finder_git.py b/src/setuptools_scm/file_finder_git.py
index b7b55ed..5cda162 100644
--- a/src/setuptools_scm/file_finder_git.py
+++ b/src/setuptools_scm/file_finder_git.py
@@ -28,16 +28,16 @@ def _git_toplevel(path):
 
 
 def _git_interpret_archive(fd, toplevel):
-    tf = tarfile.open(fileobj=fd, mode="r|*")
-    git_files = set()
-    git_dirs = {toplevel}
-    for member in tf.getmembers():
-        name = os.path.normcase(member.name).replace("/", os.path.sep)
-        if member.type == tarfile.DIRTYPE:
-            git_dirs.add(name)
-        else:
-            git_files.add(name)
-    return git_files, git_dirs
+    with tarfile.open(fileobj=fd, mode="r|*") as tf:
+        git_files = set()
+        git_dirs = {toplevel}
+        for member in tf.getmembers():
+            name = os.path.normcase(member.name).replace("/", os.path.sep)
+            if member.type == tarfile.DIRTYPE:
+                git_dirs.add(name)
+            else:
+                git_files.add(name)
+        return git_files, git_dirs
 
 
 def _git_ls_files_and_dirs(toplevel):
@@ -46,7 +46,11 @@ def _git_ls_files_and_dirs(toplevel):
     cmd = ["git", "archive", "--prefix", toplevel + os.path.sep, "HEAD"]
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, cwd=toplevel)
     try:
-        return _git_interpret_archive(proc.stdout, toplevel)
+        try:
+            return _git_interpret_archive(proc.stdout, toplevel)
+        finally:
+            # ensure we avoid ressource warnings by cleaning up the pocess
+            proc.wait()
     except Exception:
         if proc.wait() != 0:
             log.exception("listing git files failed - pretending there aren't any")