From 6ba1cd797b02e5a65ffbbffeadf8239045916fbc Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sat, 18 Feb 2017 14:47:18 -0800 Subject: [PATCH] Fix regression in whitespace stripping at the start of messages. This fixes a regression in 4060a976562f14d0833d9538a6025458cc6738ab, which incorrectly stripped whitespace at the start of messages as well. Fixes #3719. --- zerver/lib/actions.py | 2 +- zerver/tests/test_messages.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 720e571adb..9d5e20e61b 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -1249,7 +1249,7 @@ def check_message(sender, client, message_type_name, message_to, message_to = [sender.default_sending_stream.name] if len(message_to) == 0: raise JsonableError(_("Message must have recipients")) - message_content = message_content_raw.strip() + message_content = message_content_raw.rstrip() if len(message_content) == 0: raise JsonableError(_("Message must not be empty")) message_content = truncate_body(message_content) diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py index 72d5f1f14b..20f0992667 100644 --- a/zerver/tests/test_messages.py +++ b/zerver/tests/test_messages.py @@ -861,11 +861,11 @@ class MessagePOSTTest(ZulipTestCase): """ self.login("hamlet@zulip.com") post_data = {"type": "stream", "to": "Verona", "client": "test suite", - "content": "I like whitespace at the end! \n\n \n", "subject": "Test subject"} + "content": " I like whitespace at the end! \n\n \n", "subject": "Test subject"} result = self.client_post("/json/messages", post_data) self.assert_json_success(result) sent_message = self.get_last_message() - self.assertEqual(sent_message.content, "I like whitespace at the end!") + self.assertEqual(sent_message.content, " I like whitespace at the end!") def test_long_message(self): # type: () -> None