diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | conform/glibcconform.py | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index dc267e2d4d..944d8faaad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2018-10-29 Joseph Myers <joseph@codesourcery.com> + * conform/glibcconform.py: Do not import shutil. + (list_exported_functions): Use tempfile.TemporaryDirectory instead + of mkdtemp. + * configure.ac (PYTHON_PROG): Use AC_CHECK_PROG_VER. Set critic_missing for versions before 3.4. * configure: Regenerated. diff --git a/conform/glibcconform.py b/conform/glibcconform.py index 31ad4a9f9f..c1db46029d 100644 --- a/conform/glibcconform.py +++ b/conform/glibcconform.py @@ -19,7 +19,6 @@ import os.path import re -import shutil import subprocess import tempfile @@ -43,11 +42,9 @@ def list_exported_functions(cc, standard, header): """ cc_all = '%s -D_ISOMAC %s' % (cc, CFLAGS[standard]) - # tempfile.TemporaryDirectory requires Python 3.2, so use mkdtemp. - temp_dir = tempfile.mkdtemp() - c_file_name = os.path.join(temp_dir, 'test.c') - aux_file_name = os.path.join(temp_dir, 'test.c.aux') - try: + with tempfile.TemporaryDirectory() as temp_dir: + c_file_name = os.path.join(temp_dir, 'test.c') + aux_file_name = os.path.join(temp_dir, 'test.c.aux') with open(c_file_name, 'w') as c_file: c_file.write('#include <%s>\n' % header) fns = set() @@ -72,6 +69,4 @@ def list_exported_functions(cc, standard, header): else: raise ValueError("couldn't parse -aux-info output: %s" % line) - finally: - shutil.rmtree(temp_dir) return fns |