[diffoscope] 04/05: diff: Use diffoscope.tempfiles over tempfile.TemporaryDirectory to ensure cleanup at end of diffoscope run.

[Chris Lamb]

This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository diffoscope.

commit 9eac636bccfa7274708eafb3145d12f1d8968167
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Feb 8 11:43:38 2017 +1300

    diff: Use diffoscope.tempfiles over tempfile.TemporaryDirectory to ensure cleanup at end of diffoscope run.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 diffoscope/diff.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/diffoscope/diff.py b/diffoscope/diff.py
index 134bfe3..71b9087 100644
--- a/diffoscope/diff.py
+++ b/diffoscope/diff.py
@@ -24,10 +24,11 @@ import logging
 import threading
 import contextlib
 import subprocess
-import tempfile
 
 from multiprocessing.dummy import Queue
 
+from diffoscope.tempfiles import get_temporary_directory
+
 from .tools import tool_required
 from .config import Config
 
@@ -276,12 +277,14 @@ def diff(feeder1, feeder2):
     end_nl_q1 = Queue()
     end_nl_q2 = Queue()
 
-    with tempfile.TemporaryDirectory() as tmpdir:
-        fifo1 = '{}/f1'.format(tmpdir)
-        fifo2 = '{}/f2'.format(tmpdir)
-        fd_from_feeder(feeder1, end_nl_q1, fifo1)
-        fd_from_feeder(feeder2, end_nl_q2, fifo2)
-        return run_diff(fifo1, fifo2, end_nl_q1, end_nl_q2)
+    tmpdir = get_temporary_directory().name
+
+    fifo1 = '{}/f1'.format(tmpdir)
+    fifo2 = '{}/f2'.format(tmpdir)
+    fd_from_feeder(feeder1, end_nl_q1, fifo1)
+    fd_from_feeder(feeder2, end_nl_q2, fifo2)
+
+    return run_diff(fifo1, fifo2, end_nl_q1, end_nl_q2)
 
 def reverse_unified_diff(diff):
     res = []

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git