Skip to content

Commit 75ef179

Browse files
committed
Disallow FluentBundle.has_message from seeing message attributes
1 parent 990a8bd commit 75ef179

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

fluent.runtime/fluent/bundle/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ def add_messages(self, source):
4545
self._messages_and_terms[item.id.name] = item
4646

4747
def has_message(self, message_id):
48-
try:
49-
self._get_message(message_id)
50-
return True
51-
except LookupError:
48+
if message_id.startswith('-'):
5249
return False
50+
return message_id in self._messages_and_terms
5351

5452
def format(self, message_id, args=None):
5553
message = self._get_message(message_id)

fluent.runtime/tests/test_bundle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def test_has_message_with_attribute(self):
4444
"""))
4545

4646
self.assertTrue(self.ctx.has_message('foo'))
47-
self.assertTrue(self.ctx.has_message('foo.attr'))
47+
self.assertFalse(self.ctx.has_message('foo.attr'))
4848
self.assertFalse(self.ctx.has_message('foo.other-attribute'))
4949

5050
def test_plural_form_english_ints(self):

0 commit comments

Comments
 (0)