Commit 9eac636b authored by Chris Lamb's avatar Chris Lamb 👀
Browse files

diff: Use diffoscope.tempfiles over tempfile.TemporaryDirectory to ensure... 


diff: Use diffoscope.tempfiles over tempfile.TemporaryDirectory to ensure cleanup at end of diffoscope run.

Signed-off-by: Chris Lamb's avatarChris Lamb <lamby@debian.org>
parent d8898e88

diffoscope/diff.py

+10 −7
Original line number Diff line number Diff line
@@ -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,11 +277,13 @@ def diff(feeder1, feeder2): 
    end_nl_q1 = Queue()

    end_nl_q2 = Queue()



    with tempfile.TemporaryDirectory() as tmpdir:

    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):