mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 3.2 (#15801)

Browse source
This commit is contained in:
Benjamin Peterson 2012-08-28 18:01:45 -04:00
commit 59043f96ea
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/string_tests.py
View file

@ -1206,6 +1206,9 @@ class MixinStrUnicodeUserStringTest:
self.checkraises(ValueError, '%%%df' % (2**64), '__mod__', (3.2)) self.checkraises(ValueError, '%%%df' % (2**64), '__mod__', (3.2))
self.checkraises(ValueError, '%%.%df' % (2**64), '__mod__', (3.2)) self.checkraises(ValueError, '%%.%df' % (2**64), '__mod__', (3.2))
class X(object): pass
self.checkraises(TypeError, 'abc', '__mod__', X())
def test_floatformatting(self): def test_floatformatting(self):
# float formatting # float formatting
for prec in range(100): for prec in range(100):

3
Misc/NEWS
View file

@ -71,6 +71,9 @@ Core and Builtins
- Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X. - Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X.
- Issue #15801: Make sure mappings passed to '%' formatting are actually
subscriptable.
- Issue #15726: Fix incorrect bounds checking in PyState_FindModule. - Issue #15726: Fix incorrect bounds checking in PyState_FindModule.
Patch by Robin Schreiber. Patch by Robin Schreiber.

3
Objects/unicodeobject.c
View file

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