Skip to content
Snippets Groups Projects
Commit 9eac636b authored by Chris Lamb's avatar Chris Lamb :eyes:
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
No related branches found
No related tags found
No related merge requests found
......@@ -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 = []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment