From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 28 Aug 2012 22:01:45 +0000 (-0400)
Subject: merge 3.2 (#15801)
X-Git-Tag: v3.3.1rc1~818^2^2~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59043f96eaf5797c0a1f9058b802fcfea5d044fa;p=python

merge 3.2 (#15801)
---

59043f96eaf5797c0a1f9058b802fcfea5d044fa
diff --cc Lib/test/string_tests.py
index 8da3e774f8,413f9dd8fe..e4688d08fb
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@@ -1202,10 -1142,9 +1202,13 @@@ class MixinStrUnicodeUserStringTest
          self.checkraises(TypeError, '%10.*f', '__mod__', ('foo', 42.))
          self.checkraises(ValueError, '%10', '__mod__', (42,))
  
 +        # Outrageously large width or precision should raise ValueError.
 +        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):
          # float formatting
          for prec in range(100):
diff --cc Misc/NEWS
index f59b1b8c65,25be2aa88e..fef26875c7
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,75 -10,104 +10,78 @@@ What's New in Python 3.3.
  Core and Builtins
  -----------------
  
 -- 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.
 -  Patch by Robin Schreiber.
 -
 -- Issue #15604: Update uses of PyObject_IsTrue() to check for and handle
 -  errors correctly.  Patch by Serhiy Storchaka.
 -
 -- Issue #13119: sys.stdout and sys.stderr are now using "\r\n" newline on
 -  Windows, as Python 2.
 -
 -- Issue #14579: Fix CVE-2012-2135: vulnerability in the utf-16 decoder after
 -  error handling.  Patch by Serhiy Storchaka.
 -
 -- Issue #15404: Refleak in PyMethodObject repr.
 -
 -- Issue #15394: An issue in PyModule_Create that caused references to
 -  be leaked on some error paths has been fixed.  Patch by Julia Lawall.
 -
 -- Issue #15368: An issue that caused bytecode generation to be
 -  non-deterministic when using randomized hashing (-R) has been fixed.
 +Library
 +-------
  
 -- Issue #15020: The program name used to search for Python's path is now
 -  "python3" under Unix, not "python".
 +Extension Modules
 +-----------------
  
 -- Issue #15033: Fix the exit status bug when modules invoked using -m swith,
 -  return the proper failure return value (1). Patch contributed by Jeff Knupp.
 +Tests
 +-----
  
 -- Issue #12268: File readline, readlines and read() or readall() methods
 -  no longer lose data when an underlying read system call is interrupted.
 -  IOError is no longer raised due to a read system call returning EINTR
 -  from within these methods.
 +Build
 +-----
  
 -- Issue #15142: Fix reference leak when deallocating instances of types
 -  created using PyType_FromSpec().
 +Documentation
 +-------------
  
 -- Issue #10053: Don't close FDs when FileIO.__init__ fails. Loosely based on
 -  the work by Hirokazu Yamamoto.
 +- Issue #11964: Document a change in v3.2 to the behavior of the indent
 +  parameter of json encoding operations.
  
 -- Issue #14775: Fix a potential quadratic dict build-up due to the garbage
 -  collector repeatedly trying to untrack dicts.
 +Tools/Demos
 +-----------
  
 -- Issue #14494: Fix __future__.py and its documentation to note that
 -  absolute imports are the default behavior in 3.0 instead of 2.7.
 -  Patch by Sven Marnach.
  
 -- Issue #14761: Fix potential leak on an error case in the import machinery.
 +What's New in Python 3.3.0 Release Candidate 2?
 +===============================================
  
 -- Issue #14699: Fix calling the classmethod descriptor directly.
 +*Release date: XX-Sep-2012*
  
 -- Issue #14433: Prevent msvcrt crash in interactive prompt when stdin
 -  is closed.
 +Core and Builtins
 +-----------------
  
 -- Issue #11603 (again): Setting __repr__ to __str__ now raises a RuntimeError
 -  when repr() or str() is called on such an object.
 +- Issue #15781: Fix two small race conditions in import's module locking.
  
 -- Issue #14658: Fix binding a special method to a builtin implementation of a
 -  special method with a different name.
 +Library
 +-------
  
 -- Issue #14630: Fix a memory access bug for instances of a subclass of int
 -  with value 0.
  
 -- Issue #14612: Fix jumping around with blocks by setting f_lineno.
 +What's New in Python 3.3.0 Release Candidate 1?
 +===============================================
  
 -- Issue #14607: Fix keyword-only arguments which started with ``__``.
 +*Release date: 25-Aug-2012*
  
 -- Issue #13889: Check and (if necessary) set FPU control word before calling
 -  any of the dtoa.c string <-> float conversion functions, on MSVC builds of
 -  Python.  This fixes issues when embedding Python in a Delphi app.
 +Core and Builtins
 +-----------------
  
 -- Issue #14474: Save and restore exception state in thread.start_new_thread()
 -  while writing error message if the thread leaves a unhandled exception.
 +- Issue #15573: memoryview comparisons are now performed by value with full
 +  support for any valid struct module format definition.  
  
 -- Issue #13019: Fix potential reference leaks in bytearray.extend().  Patch
 -  by Suman Saha.
 +- Issue #15316: When an item in the fromlist for __import__ doesn't exist,
 +  don't raise an error, but if an exception is raised as part of an import do
 +  let that propagate.
  
 -- Issue #14378: Fix compiling ast.ImportFrom nodes with a "__future__" string as
 -  the module name that was not interned.
 +- Issue #15778: ensure that str(ImportError(msg)) returns a str
 +  even when msg isn't a str.
  
 -- Issue #14331: Use significantly less stack space when importing modules by
 -  allocating path buffers on the heap instead of the stack.
 +- Issue #2051: Source file permission bits are once again correctly
 +  copied to the cached bytecode file. (The migration to importlib
 +  reintroduced this problem because these was no regression test. A test
 +  has been added as part of this patch)
  
 -- Issue #14334: Prevent in a segfault in type.__getattribute__ when it was not
 -  passed strings.
 +- Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X.
  
 -- Issue #1469629: Allow cycles through an object's __dict__ slot to be
 -  collected. (For example if ``x.__dict__ is x``).
++- Issue #15801: Make sure mappings passed to '%' formatting are actually
++  subscriptable.
+ 
 -- Issue #14172: Fix reference leak when marshalling a buffer-like object
 -  (other than a bytes object).
 +- Issue #15726: Fix incorrect bounds checking in PyState_FindModule.
 +  Patch by Robin Schreiber.
  
 -- Issue #13521: dict.setdefault() now does only one lookup for the given key,
 -  making it "atomic" for many purposes.  Patch by Filip Gruszczyński.
 +- Issue #15604: Update uses of PyObject_IsTrue() to check for and handle
 +  errors correctly.  Patch by Serhiy Storchaka.
  
 -- Issue #14471: Fix a possible buffer overrun in the winreg module.
 +- Issue #14846: importlib.FileFinder now handles the case where the
 +  directory being searched is removed after a previous import attempt
  
  Library
  -------