From a0293e8a8696cc9717b8cd1b537e034eb006646e Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 18 Jul 2018 17:50:16 -0400 Subject: [PATCH] zerver/lib/import_realm.py: Avoid shelling out for mkdir. Signed-off-by: Anders Kaseorg --- zerver/lib/import_realm.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zerver/lib/import_realm.py b/zerver/lib/import_realm.py index 46e5742f6a..4287fd95b7 100644 --- a/zerver/lib/import_realm.py +++ b/zerver/lib/import_realm.py @@ -3,7 +3,6 @@ import logging import os import ujson import shutil -import subprocess from boto.s3.connection import S3Connection from boto.s3.key import Key @@ -355,8 +354,7 @@ def import_uploads_local(import_dir: Path, processing_avatars: bool=False, path_maps['attachment_path'][record['path']] = s3_file_name orig_file_path = os.path.join(import_dir, record['path']) - if not os.path.exists(os.path.dirname(file_path)): - subprocess.check_call(["mkdir", "-p", os.path.dirname(file_path)]) + os.makedirs(os.path.dirname(file_path), exist_ok=True) shutil.copy(orig_file_path, file_path) if processing_avatars: