paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slack import: Use Python ZipFile to unzip.

Browse Source 
This should handle the case when non-ASCII Unicode folder names are
created on Windows.

Fixes #19899.
This commit is contained in:
rht
2021-10-07 10:31:09 -04:00
committed by Tim Abbott
parent 86c3c5d6f1
commit d8e1409fe5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/data_import/slack.py
View File

@@ -4,6 +4,7 @@ import random
import secrets import secrets
import shutil import shutil
import subprocess import subprocess
import zipfile
from collections import defaultdict from collections import defaultdict
from typing import Any, Dict, Iterator, List, Optional, Set, Tuple, Type, TypeVar from typing import Any, Dict, Iterator, List, Optional, Set, Tuple, Type, TypeVar
@@ -1290,7 +1291,8 @@ def do_convert_data(original_path: str, output_dir: str, token: str, threads: in
if not os.path.exists(slack_data_dir): if not os.path.exists(slack_data_dir):
os.makedirs(slack_data_dir) os.makedirs(slack_data_dir)
subprocess.check_call(["unzip", "-q", original_path, "-d", slack_data_dir]) with zipfile.ZipFile(original_path) as zipObj:
zipObj.extractall(slack_data_dir)
elif os.path.isdir(original_path): elif os.path.isdir(original_path):
slack_data_dir = original_path slack_data_dir = original_path
else: else: