From 16b3aa3d768cdd4ccac155c4e0d7844bc304d1b5 Mon Sep 17 00:00:00 2001 From: Jose Benito Date: Tue, 6 Nov 2012 17:39:56 +0100 Subject: [PATCH] [REF] Changed name of permissive format --- indico/MaKaC/services/implementation/conference.py | 6 +++--- indico/tests/python/unit/indico_tests/util_tests/string_test.py | 6 +++--- indico/util/string.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/indico/MaKaC/services/implementation/conference.py b/indico/MaKaC/services/implementation/conference.py index b255628ee..a09ab579f 100644 --- a/indico/MaKaC/services/implementation/conference.py +++ b/indico/MaKaC/services/implementation/conference.py @@ -24,7 +24,7 @@ Asynchronous request handlers for conference-related data modification. # 3rd party imports from email.utils import formataddr -from indico.util.string import formatParentheses +from indico.util.string import permissive_format import datetime from pytz import timezone @@ -748,8 +748,8 @@ class ConferenceParticipantBase: url=urlHandlers.UHConferenceDisplay.getURL( self._conf ), urlRefusal=urlRefusal, urlInvitation=urlInvitation) - data["body"] = formatParentheses(data["body"], mailEnv) - data["subject"] = formatParentheses(data["subject"], mailEnv) + data["body"] = permissive_format(data["body"], mailEnv) + data["subject"] = permissive_format(data["subject"], mailEnv) GenericMailer.sendAndLog(GenericNotification(data),self._conf,"participants", self._getUser()) class ConferenceAddEditParticipantBase(ConferenceParticipantBase): diff --git a/indico/tests/python/unit/indico_tests/util_tests/string_test.py b/indico/tests/python/unit/indico_tests/util_tests/string_test.py index 32d0fef23..f98569464 100644 --- a/indico/tests/python/unit/indico_tests/util_tests/string_test.py +++ b/indico/tests/python/unit/indico_tests/util_tests/string_test.py @@ -22,9 +22,9 @@ Tests for `indico.util.string` module """ import unittest -from indico.util.string import formatParentheses +from indico.util.string import permissive_format -class TestFormatParentheses(unittest.TestCase): +class TestPermissiveFormat(unittest.TestCase): def testTextParenthesesFormatting(self): params = dict(url="www.cern.ch", name="My Name", other="Nothing") @@ -44,4 +44,4 @@ class TestFormatParentheses(unittest.TestCase): ] for text, result in zip(texts, results): - self.assertEqual(formatParentheses(text, params), result) + self.assertEqual(permissive_format(text, params), result) diff --git a/indico/util/string.py b/indico/util/string.py index b22be0cde..e32482374 100644 --- a/indico/util/string.py +++ b/indico/util/string.py @@ -59,7 +59,7 @@ def truncate(text, max_size, ellipsis='...', encoding='utf-8'): return text -def formatParentheses(text, params): +def permissive_format(text, params): """ Format text using params from dictionary. Function is resistant to missing parentheses """ -- 2.11.4.GIT