mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-15 21:04:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow any type with __getitem__ to be a mapping for the purposes of % (#15801)

Browse Source
This commit is contained in:
Benjamin Peterson 2013-03-23 22:32:00 -05:00
parent 7e2f197a2b
commit da2c7ebd23
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/string_tests.py
View File

@ -1130,6 +1130,10 @@ class MixinStrUnicodeUserStringTest:
class X(object): pass
self.checkraises(TypeError, 'abc', '__mod__', X())
class X(Exception):
def __getitem__(self, k):
return k
self.checkequal('melon apple', '%(melon)s %(apple)s', '__mod__', X())
def test_floatformatting(self):
# float formatting

7
Misc/NEWS
View File

@ -6,6 +6,13 @@ What's New in Python 2.7.4?
*Release date: XXXX-XX-XX*
Core and Builtins
-----------------
- Issue #15801 (again): With string % formatting, relax the type check for a
mapping such that any type with a __getitem__ can be used on the right hand
side.
Library
-------

4
Objects/stringobject.c
View File

@ -4257,8 +4257,8 @@ PyString_Format(PyObject *format, PyObject *args)
arglen = -1;
argidx = -2;
}
if (PyMapping_Check(args) && !PyTuple_Check(args) &&
!PyObject_TypeCheck(args, &PyBaseString_Type))
if (Py_TYPE(args)->tp_as_mapping && Py_TYPE(args)->tp_as_mapping->mp_subscript &&
!PyTuple_Check(args) && !PyObject_TypeCheck(args, &PyBaseString_Type))
dict = args;
while (--fmtcnt >= 0) {
if (*fmt != '%') {

4
Objects/unicodeobject.c
View File

@ -8287,8 +8287,8 @@ PyObject *PyUnicode_Format(PyObject *format,
arglen = -1;
argidx = -2;
}
if (PyMapping_Check(args) && !PyTuple_Check(args) &&
!PyObject_TypeCheck(args, &PyBaseString_Type))
if (Py_TYPE(args)->tp_as_mapping && Py_TYPE(args)->tp_as_mapping->mp_subscript &&
!PyTuple_Check(args) && !PyObject_TypeCheck(args, &PyBaseString_Type))
dict = args;
while (--fmtcnt >= 0) {