[backport to 2.7] bpo-28598: Support __rmod__ for RHS subclasses of s…

…tr in % string formatting operations
python · mjpieters · Mar 1, 2017 · Mar 1, 2017 · Mar 1, 2017 · 9097de9e62f003bd038e4da6b36823a2d0b9853a
commit 9097de9e62f003bd038e4da6b36823a2d0b9853a
diff --git a/Lib/test/test_str.py b/Lib/test/test_str.py
@@ -38,6 +38,15 @@ def test_formatting(self):
         string_tests.MixinStrUnicodeUserStringTest.test_formatting(self)
         self.assertRaises(OverflowError, '%c'.__mod__, 0x1234)
 
+    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")
+
     @test_support.cpython_only
     def test_formatting_huge_precision(self):
         from _testcapi import INT_MAX

diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1446,10 +1446,14 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
         {
             w = POP();
             v = TOP();
-            if (PyString_CheckExact(v))
+            if (PyString_CheckExact(v) &&
+                  !PyString_Check(w) || PyString_CheckExact(w)) {
+                /* fast path; string formatting, but not if the RHS is a str
+                 * subclass (see issue28598) */
                 x = PyString_Format(v, w);
-            else
+            } else {
                 x = PyNumber_Remainder(v, w);
+            }
             Py_DECREF(v);
             Py_DECREF(w);
             SET_TOP(x);