paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-25 17:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

slack_import: Remove obsolete SlackImportAttachment placeholder.

Browse Source 
This was introduced in f4ad464d82, and
incompletely removed in e037c2f93e649c28a71c02559b5ae7a3333f42a8; here
we finish removing it.
This commit is contained in:
rht
2021-08-01 10:12:50 -04:00
committed by Tim Abbott
parent af5958e407
commit 1b4832a703
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/data_import/slack.py
View File

@@ -1094,8 +1094,6 @@ def get_attachment_path_and_content(fileinfo: ZerverFieldsT, realm_id: int) -> T
s3_path = "/".join( s3_path = "/".join(
[ [
str(realm_id), str(realm_id),
"SlackImportAttachment", # This is a special placeholder which should be kept
# in sync with 'exports.py' function 'import_message_data'
format(random.randint(0, 255), "x"), format(random.randint(0, 255), "x"),
secrets.token_urlsafe(18), secrets.token_urlsafe(18),
sanitize_name(fileinfo["name"]), sanitize_name(fileinfo["name"]),

1
zerver/tests/test_slack_importer.py
View File

@@ -1137,7 +1137,6 @@ class SlackImporter(ZulipTestCase):
self.assertEqual(len(uploads_list), 1) self.assertEqual(len(uploads_list), 1)
image_path = zerver_attachment[0]["path_id"] image_path = zerver_attachment[0]["path_id"]
self.assertIn("/SlackImportAttachment/", image_path)
expected_content = f"[Apple](/user_uploads/{image_path})\n[banana](example.com/banana.zip)" expected_content = f"[Apple](/user_uploads/{image_path})\n[banana](example.com/banana.zip)"
self.assertEqual(info["content"], expected_content) self.assertEqual(info["content"], expected_content)