[diffoscope] 05/05: diff: Use os.path.join over manual path manipulation.

Chris Lamb chris at chris-lamb.co.uk
Tue Feb 7 23:50:39 CET 2017


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

lamby pushed a commit to branch master
in repository diffoscope.

commit 659c57dfac022f631090c79b1dda4528dd65cf7a
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Feb 8 11:45:46 2017 +1300

    diff: Use os.path.join over manual path manipulation.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 diffoscope/diff.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/diffoscope/diff.py b/diffoscope/diff.py
index 71b9087..c35ad38 100644
--- a/diffoscope/diff.py
+++ b/diffoscope/diff.py
@@ -19,6 +19,7 @@
 
 import re
 import io
+import os
 import hashlib
 import logging
 import threading
@@ -279,8 +280,8 @@ def diff(feeder1, feeder2):
 
     tmpdir = get_temporary_directory().name
 
-    fifo1 = '{}/f1'.format(tmpdir)
-    fifo2 = '{}/f2'.format(tmpdir)
+    fifo1 = os.path.join(tmpdir, 'f1')
+    fifo2 = os.path.join(tmpdir, 'f2')
     fd_from_feeder(feeder1, end_nl_q1, fifo1)
     fd_from_feeder(feeder2, end_nl_q2, fifo2)
 

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


More information about the diffoscope mailing list