bpo-28598: Support __rmod__ for RHS subclasses of str in % string formatting operations (#95)
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 86ebd45..2844bc5 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1448,6 +1448,15 @@
with self.assertRaises(ValueError):
result = format_string % 2.34
+ def test_issue28598_strsubclass_rhs(self):
+ # A subclass of str with an __rmod__ method should be able to hook
+ # into the % operator
+ class SubclassedStr(str):
+ def __rmod__(self, other):
+ return 'Success, self.__rmod__({!r}) was called'.format(other)
+ self.assertEqual('lhs %% %r' % SubclassedStr('rhs'),
+ "Success, self.__rmod__('lhs %% %r') was called")
+
@support.cpython_only
def test_formatting_huge_precision_c_limits(self):
from _testcapi import INT_MAX
diff --git a/Misc/NEWS b/Misc/NEWS
index 7ec6b12..fe420b6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #28598: Support __rmod__ for subclasses of str being called before
+ str.__mod__. Patch by Martijn Pieters.
+
- bpo-29607: Fix stack_effect computation for CALL_FUNCTION_EX.
Patch by Matthieu Dartiailh.
diff --git a/Python/ceval.c b/Python/ceval.c
index d5172b9..c9e9c32 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1409,9 +1409,15 @@
TARGET(BINARY_MODULO) {
PyObject *divisor = POP();
PyObject *dividend = TOP();
- PyObject *res = PyUnicode_CheckExact(dividend) ?
- PyUnicode_Format(dividend, divisor) :
- PyNumber_Remainder(dividend, divisor);
+ PyObject *res;
+ if (PyUnicode_CheckExact(dividend) && (
+ !PyUnicode_Check(divisor) || PyUnicode_CheckExact(divisor))) {
+ // fast path; string formatting, but not if the RHS is a str subclass
+ // (see issue28598)
+ res = PyUnicode_Format(dividend, divisor);
+ } else {
+ res = PyNumber_Remainder(dividend, divisor);
+ }
Py_DECREF(divisor);
Py_DECREF(dividend);
SET_TOP(res);