summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Gedminas <marius@gedmin.as>2019-07-10 15:07:52 +0300
committerMarius Gedminas <marius@gedmin.as>2019-07-10 15:52:44 +0300
commit0b1ab1c6da31996f63891f12fce50e2e1e703453 (patch)
tree7a3a7067c14a913223c9429a6ab3416118e3f86c
parentb6f4f1710d34328f7d32eff692f6c61cd78bb455 (diff)
downloadzope-i18n-0b1ab1c6da31996f63891f12fce50e2e1e703453.tar.gz
Fix the signature of IMessageCatalog.getPluralMessage()
Also make sure we don't include literal U+0000 and U+FFFD characters in the docstring of INumberFormat on Python 3 were \u is a real escape sequence in non-u-prefixed tripple-quoted strings.
-rw-r--r--CHANGES.rst3
-rw-r--r--src/zope/i18n/interfaces/__init__.py6
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 5b38083..b7fc8d4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,9 @@
- Drop Python 3.4 support.
+- Fix the signature of ``IMessageCatalog.getPluralMessage()``. See `issue 41
+ <https://zopefoundation/zope.i18n/issue/41>`_.
+
4.6.2 (2019-02-19)
==================
diff --git a/src/zope/i18n/interfaces/__init__.py b/src/zope/i18n/interfaces/__init__.py
index 11d8c21..c5a3328 100644
--- a/src/zope/i18n/interfaces/__init__.py
+++ b/src/zope/i18n/interfaces/__init__.py
@@ -60,14 +60,14 @@ class IMessageCatalog(Interface):
An exception is raised if the message id is not found.
"""
-
+
def queryMessage(msgid, default=None):
"""Look for the appropriate text for the given message id.
If the message id is not found, default is returned.
"""
- def getPluralMessage(self, singular, plural, n):
+ def getPluralMessage(singular, plural, n):
"""Get the appropriate text for the given message id and the
plural id.
@@ -328,7 +328,7 @@ class IFormat(Interface):
class INumberFormat(IFormat):
- """Specific number formatting interface. Here are the formatting
+ r"""Specific number formatting interface. Here are the formatting
rules (I modified the rules from ICU a bit, since I think they did not
agree well with the real world XML formatting strings):