Issue #24731: Fixed crash on converting objects with special methods

__bytes__, __trunc__, and __float__ returning instances of subclasses of
bytes, int, and float to subclasses of bytes, int, and float correspondingly.

diff --cc Lib/test/test_bytes.py
Simple merge

diff --cc Lib/test/test_float.py
Simple merge

diff --cc Lib/test/test_int.py
Simple merge

diff --cc Lib/test/test_unicode.py
Simple merge

diff --cc Misc/NEWS
index 97e2ecd9f529ef0f2cae0b2b83987539cd5bbea6,bae669856747666f00db01c3f884dcf1e3b8d979..99e962be28a88626c09741a6b3ead80031b34b0d
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,117 -10,120 +10,121 @@@ Release date: XXXX-XX-X
  Core and Builtins
  -----------------
  
 -- Issue #25388: Fixed tokenizer crash when processing undecodable source code
 -  with a null byte.
+ - Issue #24731: Fixed crash on converting objects with special methods
+   __bytes__, __trunc__, and __float__ returning instances of subclasses of
+   bytes, int, and float to subclasses of bytes, int, and float correspondingly.
+ 
 +Library
 +-------
  
 -- Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
 -  rejects builtin types with not defined __new__.
 +- Issue #25725: Fixed a reference leak in pickle.loads() when unpickling
 +  invalid data including tuple instructions.
  
 -- Issue #24802: Avoid buffer overreads when int(), float(), compile(), exec()
 -  and eval() are passed bytes-like objects.  These objects are not
 -  necessarily terminated by a null byte, but the functions assumed they were.
 +- Issue #25663: In the Readline completer, avoid listing duplicate global
 +  names, and search the global namespace before searching builtins.
  
 -- Issue #24402: Fix input() to prompt to the redirected stdout when
 -  sys.stdout.fileno() fails.
 +- Issue #25688: Fixed file leak in ElementTree.iterparse() raising an error.
  
 -- Issue #24806: Prevent builtin types that are not allowed to be subclassed from
 -  being subclassed through multiple inheritance.
 +- Issue #23914: Fixed SystemError raised by unpickler on broken pickle data.
  
 -- Issue #24848: Fixed a number of bugs in UTF-7 decoding of misformed data.
 +- Issue #25691: Fixed crash on deleting ElementTree.Element attributes.
  
 -- Issue #25280: Import trace messages emitted in verbose (-v) mode are no
 -  longer formatted twice.
 +- Issue #25624: ZipFile now always writes a ZIP_STORED header for directory
 +  entries.  Patch by Dingyuan Wang.
  
 -- Issue #25003: os.urandom() doesn't use getentropy() on Solaris because
 -  getentropy() is blocking, whereas os.urandom() should not block. getentropy()
 -  is supported since Solaris 11.3.
  
 -- Issue #25182: The stdprinter (used as sys.stderr before the io module is
 -  imported at startup) now uses the backslashreplace error handler.
 +What's New in Python 3.5.1 final?
 +=================================
  
 -- Issue #24891: Fix a race condition at Python startup if the file descriptor
 -  of stdin (0), stdout (1) or stderr (2) is closed while Python is creating
 -  sys.stdin, sys.stdout and sys.stderr objects. These attributes are now set
 -  to None if the creation of the object failed, instead of raising an OSError
 -  exception. Initial patch written by Marco Paolini.
 +Release date: 2015-12-06
  
 -- Issue #21167: NAN operations are now handled correctly when python is
 -  compiled with ICC even if -fp-model strict is not specified.
 +Core and Builtins
 +-----------------
  
 -- Issue #4395: Better testing and documentation of binary operators.
 -  Patch by Martin Panter.
 +Library
 +-------
  
 -- Issue #24467: Fixed possible buffer over-read in bytearray. The bytearray
 -  object now always allocates place for trailing null byte and it's buffer now
 -  is always null-terminated.
  
 -- Issue #24115: Update uses of PyObject_IsTrue(), PyObject_Not(),
 -  PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains()
 -  to check for and handle errors correctly.
 +What's New in Python 3.5.1 release candidate 1?
 +===============================================
  
 -- Issue #24257: Fixed system error in the comparison of faked
 -  types.SimpleNamespace.
 +Release date: 2015-11-22
  
 -- Issue #22939: Fixed integer overflow in iterator object.  Patch by
 -  Clement Rouault.
 +Core and Builtins
 +-----------------
  
 -- Issue #23985: Fix a possible buffer overrun when deleting a slice from
 -  the front of a bytearray and then appending some other bytes data.
 +- Issue #25630: Fix a possible segfault during argument parsing in functions
 +  that accept filesystem paths.
  
 -- Issue #24102: Fixed exception type checking in standard error handlers.
 +- Issue #23564: Fixed a partially broken sanity check in the _posixsubprocess
 +  internals regarding how fds_to_pass were passed to the child.  The bug had
 +  no actual impact as subprocess.py already avoided it.
  
 -- Issue #23757: PySequence_Tuple() incorrectly called the concrete list API
 -  when the data was a list subclass.
 +- Issue #25388: Fixed tokenizer crash when processing undecodable source code
 +  with a null byte.
  
 -- Issue #24407: Fix crash when dict is mutated while being updated.
 +- Issue #25462: The hash of the key now is calculated only once in most
 +  operations in C implementation of OrderedDict.
  
 -- Issue #24096: Make warnings.warn_explicit more robust against mutation of the
 -  warnings.filters list.
 +- Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
 +  rejects builtin types with not defined __new__.
  
 -- Issue #23996: Avoid a crash when a delegated generator raises an
 -  unnormalized StopIteration exception.  Patch by Stefan Behnel.
 +- Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node
 +  when compiling AST from Python objects.
  
 -- Issue #24022: Fix tokenizer crash when processing undecodable source code.
 +- Issue #24802: Avoid buffer overreads when int(), float(), compile(), exec()
 +  and eval() are passed bytes-like objects.  These objects are not
 +  necessarily terminated by a null byte, but the functions assumed they were.
  
 -- Issue #23309: Avoid a deadlock at shutdown if a daemon thread is aborted
 -  while it is holding a lock to a buffered I/O object, and the main thread
 -  tries to use the same I/O object (typically stdout or stderr).  A fatal
 -  error is emitted instead.
 +- Issue #24726: Fixed a crash and leaking NULL in repr() of OrderedDict that
 +  was mutated by direct calls of dict methods.
  
 -- Issue #22977: Fixed formatting Windows error messages on Wine.
 -  Patch by Martin Panter.
 +- Issue #25449: Iterating OrderedDict with keys with unstable hash now raises
 +  KeyError in C implementations as well as in Python implementation.
  
 -- Issue #23803: Fixed str.partition() and str.rpartition() when a separator
 -  is wider then partitioned string.
 +- Issue #25395: Fixed crash when highly nested OrderedDict structures were
 +  garbage collected.
  
 -- Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.
 +- Issue #25274: sys.setrecursionlimit() now raises a RecursionError if the new
 +  recursion limit is too low depending at the current recursion depth. Modify
 +  also the "lower-water mark" formula to make it monotonic. This mark is used
 +  to decide when the overflowed flag of the thread state is reset.
  
 -- Issue #23629: Fix the default __sizeof__ implementation for variable-sized
 -  objects.
 +- Issue #24402: Fix input() to prompt to the redirected stdout when
 +  sys.stdout.fileno() fails.
  
 -- Issue #24044: Fix possible null pointer dereference in list.sort in out of
 -  memory conditions.
 +- Issue #24806: Prevent builtin types that are not allowed to be subclassed from
 +  being subclassed through multiple inheritance.
  
 -- Issue #21354: PyCFunction_New function is exposed by python DLL again.
 +- Issue #24848: Fixed a number of bugs in UTF-7 decoding of misformed data.
  
 -Library
 --------
 +- Issue #25280: Import trace messages emitted in verbose (-v) mode are no
 +  longer formatted twice.
  
 -- Issue #25725: Fixed a reference leak in pickle.loads() when unpickling
 -  invalid data including tuple instructions.
 +- Issue #25003: On Solaris 11.3 or newer, os.urandom() now uses the
 +  getrandom() function instead of the getentropy() function. The getentropy()
 +  function is blocking to generate very good quality entropy, os.urandom()
 +  doesn't need such high-quality entropy.
  
 -- Issue #25663: In the Readline completer, avoid listing duplicate global
 -  names, and search the global namespace before searching builtins.
 +- Issue #25182: The stdprinter (used as sys.stderr before the io module is
 +  imported at startup) now uses the backslashreplace error handler.
  
 -- Issue #25688: Fixed file leak in ElementTree.iterparse() raising an error.
 +- Issue #25131: Make the line number and column offset of set/dict literals and
 +  comprehensions correspond to the opening brace.
  
 -- Issue #23914: Fixed SystemError raised by unpickler on broken pickle data.
 +- Issue #25150: Hide the private _Py_atomic_xxx symbols from the public
 +  Python.h header to fix a compilation error with OpenMP. PyThreadState_GET()
 +  becomes an alias to PyThreadState_Get() to avoid ABI incompatibilies.
  
 -- Issue #25691: Fixed crash on deleting ElementTree.Element attributes.
 +Library
 +-------
  
 -- Issue #25624: ZipFile now always writes a ZIP_STORED header for directory
 -  entries.  Patch by Dingyuan Wang.
 +- Issue #25626: Change three zlib functions to accept sizes that fit in
 +  Py_ssize_t, but internally cap those sizes to UINT_MAX.  This resolves a
 +  regression in 3.5 where GzipFile.read() failed to read chunks larger than 2
 +  or 4 GiB.  The change affects the zlib.Decompress.decompress() max_length
 +  parameter, the zlib.decompress() bufsize parameter, and the
 +  zlib.Decompress.flush() length parameter.
  
  - Issue #25583: Avoid incorrect errors raised by os.makedirs(exist_ok=True)
    when the OS gives priority to errors such as EACCES over EEXIST.

diff --cc Objects/bytesobject.c
index 08275ad5ada1b6eb785cd6ead402f11b71bf322c,27f406947208632acf37b30d58609ea9c24cf87f..8e098494de6d71cf8bf18fb8bb780597685e075b
--- 1/Objects/bytesobject.c
--- 2/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@@ -3130,23 -2444,8 +3130,23 @@@ bytes_methods[] = 
      {NULL,     NULL}                         /* sentinel */
  };
  
 +static PyObject *
 +bytes_mod(PyObject *v, PyObject *w)
 +{
 +    if (!PyBytes_Check(v))
 +        Py_RETURN_NOTIMPLEMENTED;
 +    return _PyBytes_Format(v, w);
 +}
 +
 +static PyNumberMethods bytes_as_number = {
 +    0,              /*nb_add*/
 +    0,              /*nb_subtract*/
 +    0,              /*nb_multiply*/
 +    bytes_mod,      /*nb_remainder*/
 +};
 +
  static PyObject *
- str_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
+ bytes_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
  
  static PyObject *
  bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)

diff --cc Objects/floatobject.c
Simple merge

diff --cc Objects/longobject.c
Simple merge