[Reproducible-commits] [diffoscope] 02/15: Replace make_temp_dir by tempfile.TemporaryDirectory

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/parallel2
in repository diffoscope.

commit 517dfa09d1abe4e1a12c551aead0cda69f8f11b2
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue Oct 6 09:20:14 2015 +0000

    Replace make_temp_dir by tempfile.TemporaryDirectory
    
    TemporaryDirectory appeared in Python 3.2 and is a better version of
    our make_temp_dir function.
---
 diffoscope/comparators/rpm.py   | 5 +++--
 diffoscope/comparators/utils.py | 9 ---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/diffoscope/comparators/rpm.py b/diffoscope/comparators/rpm.py
index afa3eff..c693598 100644
--- a/diffoscope/comparators/rpm.py
+++ b/diffoscope/comparators/rpm.py
@@ -22,10 +22,11 @@ from binascii import hexlify
 from io import StringIO
 import os.path
 import subprocess
+import tempfile
 import rpm
 from diffoscope import logger, tool_required
 from diffoscope.comparators.rpm_fallback import AbstractRpmFile
-from diffoscope.comparators.utils import Archive, make_temp_directory
+from diffoscope.comparators.utils import Archive
 from diffoscope.difference import Difference
 
 def convert_header_field(io, header):
@@ -67,7 +68,7 @@ def get_rpm_header(path, ts):
 
 def compare_rpm_headers(path1, path2):
     # compare headers
-    with make_temp_directory() as rpmdb_dir:
+    with tempfile.TemporaryDirectory(suffix='diffoscope') as rpmdb_dir:
         rpm.addMacro("_dbpath", rpmdb_dir)
         ts = rpm.TransactionSet()
         ts.setVSFlags(-1)
diff --git a/diffoscope/comparators/utils.py b/diffoscope/comparators/utils.py
index 7bcb838..b6132a0 100644
--- a/diffoscope/comparators/utils.py
+++ b/diffoscope/comparators/utils.py
@@ -36,15 +36,6 @@ from diffoscope.difference import Difference
 from diffoscope import logger, tool_required
 
 
- at contextmanager
-def make_temp_directory():
-    temp_dir = tempfile.mkdtemp(suffix='diffoscope')
-    try:
-        yield temp_dir
-    finally:
-        shutil.rmtree(temp_dir)
-
-
 @tool_required('ar')
 def get_ar_content(path):
     if path == '/dev/null':

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