From e9826e1a29dd045a1a6c680d0d709906da13488b Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sat, 26 Aug 2017 21:41:54 +0100 Subject: get_mime_type: Properly close stdout handle This aims to fix the warning of Python3: ResourceWarning: unclosed file <_io.BufferedReader name=3> --- src/virtBootstrap/utils.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/virtBootstrap/utils.py') diff --git a/src/virtBootstrap/utils.py b/src/virtBootstrap/utils.py index 923309a..9d477db 100644 --- a/src/virtBootstrap/utils.py +++ b/src/virtBootstrap/utils.py @@ -179,12 +179,13 @@ def get_mime_type(path): """ Get the mime type of a file. """ - return ( - subprocess.Popen( - ["/usr/bin/file", "--mime-type", path], - stdout=subprocess.PIPE - ).stdout.read().decode('utf-8').split()[1] + proc = subprocess.Popen( + ["/usr/bin/file", "--mime-type", path], + stdout=subprocess.PIPE ) + proc.wait() + with proc.stdout as output: + return output.read().decode('utf-8').split()[1] def create_qcow2(tar_file, layer_file, backing_file=None, size=DEF_QCOW2_SIZE): -- cgit