Issue #13461: Fix a crash in the TextIOWrapper.tell method on 64-bit platforms.

Patch by Yogesh Chaudhari.

diff --cc Misc/NEWS
index df4a09b95571ecb2d930c3b791f1513c8c42811f,27fa09d743c1ecd478958be74e80031203371404..3d9015770d2a3badb00e6806e2a87479afc181d3
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -203,91 -57,45 +203,94 @@@ Core and Builtin
  - Issue #17644: Fix a crash in str.format when curly braces are used in square
    brackets.
  
 -- Issue #17983: Raise a SyntaxError for a ``global __class__`` statement in a
 -  class body.
 +- Issue #17237: Fix crash in the ASCII decoder on m68k.
  
 -- Issue #17927: Frame objects kept arguments alive if they had been copied into
 -  a cell, even if the cell was cleared.
 +- Issue #17927: Frame objects kept arguments alive if they had been
 +  copied into a cell, even if the cell was cleared.
  
 -Library
 --------
 +- Issue #1545463: At shutdown, defer finalization of codec modules so
 +  that stderr remains usable.
  
 -- Issue #13461: Fix a crash in the TextIOWrapper.tell method on 64-bit
 -  platforms.  Patch by Yogesh Chaudhari.
 +- Issue #7330: Implement width and precision (ex: "%5.3s") for the format
 +  string of PyUnicode_FromFormat() function, original patch written by Ysj Ray.
  
 -- Issue #18777: The ssl module now uses the new CRYPTO_THREADID API of
 -  OpenSSL 1.0.0+ instead of the deprecated CRYPTO id callback function.
 +- Issue #1545463: Global variables caught in reference cycles are now
 +  garbage-collected at shutdown.
  
 -- Issue #18768: Correct doc string of RAND_edg(). Patch by Vajrasky Kok.
 +- Issue #17094: Clear stale thread states after fork().  Note that this
 +  is a potentially disruptive change since it may release some system
 +  resources which would otherwise remain perpetually alive (e.g. database
 +  connections kept in thread-local storage).
  
 -- Issue #18178: Fix ctypes on BSD. dlmalloc.c was compiled twice which broke
 -  malloc weak symbols.
 +- Issue #17408: Avoid using an obsolete instance of the copyreg module when
 +  the interpreter is shutdown and then started again.
  
 -- Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
 -  inside subjectAltName correctly. Formerly the module has used OpenSSL's
 -  GENERAL_NAME_print() function to get the string represention of ASN.1
 -  strings for ``rfc822Name`` (email), ``dNSName`` (DNS) and
 -  ``uniformResourceIdentifier`` (URI).
 +- Issue #5845: Enable tab-completion in the interactive interpreter by
 +  default, thanks to a new sys.__interactivehook__.
  
 -- Issue #18756: Improve error reporting in os.urandom() when the failure
 -  is due to something else than /dev/urandom not existing (for example,
 -  exhausting the file descriptor limit).
 +- Issue #17115,17116: Module initialization now includes setting __package__ and
 +  __loader__ attributes to None.
  
 -- Issue #18405: Improve the entropy of crypt.mksalt().
 +- Issue #17853: Ensure locals of a class that shadow free variables always win
 +  over the closures.
  
 -- Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get
 -  docstrings and ValueError messages. Patch by Zhongyue Luo
 +- Issue #17863: In the interactive console, don't loop forever if the encoding
 +  can't be fetched from stdin.
 +
 +- Issue #17867: Raise an ImportError if __import__ is not found in __builtins__.
  
 -- Issue #18681: Fix a NameError in imp.reload() (noticed by Weizhao Li).
 +- Issue #18698: Ensure importlib.reload() returns the module out of sys.modules.
  
 -- Issue #8112: xlmrpc.server's DocXMLRPCServer server no longer raises an error
 -  if methods have annotations; it now correctly displays the annotations.
 +- Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,
 +  such as was shipped with Centos 5 and Mac OS X 10.4.
 +
 +- Issue #17413: sys.settrace callbacks were being passed a string instead of an
 +  exception instance for the 'value' element of the arg tuple if the exception
 +  originated from C code; now an exception instance is always provided.
 +
 +- Issue #17782: Fix undefined behaviour on platforms where
 +  ``struct timespec``'s "tv_nsec" member is not a C long.
 +
 +- Issue #17722: When looking up __round__, resolve descriptors.
 +
 +- Issue #16061: Speed up str.replace() for replacing 1-character strings.
 +
 +- Issue #17715: Fix segmentation fault from raising an exception in a __trunc__
 +  method.
 +
 +- Issue #17643: Add __callback__ attribute to weakref.ref.
 +
 +- Issue #16447: Fixed potential segmentation fault when setting __name__ on a
 +  class.
 +
 +- Issue #17669: Fix crash involving finalization of generators using yield from.
 +
 +- Issue #14439: Python now prints the traceback on runpy failure at startup.
 +
 +
 +- Issue #17469: Fix _Py_GetAllocatedBlocks() and sys.getallocatedblocks()
 +  when running on valgrind.
 +
 +- Issue #17619: Make input() check for Ctrl-C correctly on Windows.
 +
 +- Issue #17357: Add missing verbosity messages for -v/-vv that were lost during
 +  the importlib transition.
 +
 +- Issue #17610: Don't rely on non-standard behavior of the C qsort() function.
 +
 +- Issue #17323: The "[X refs, Y blocks]" printed by debug builds has been
 +  disabled by default.  It can be re-enabled with the `-X showrefcount` option.
 +
 +Library
 +-------
 +
++- Issue #13461: Fix a crash in the TextIOWrapper.tell method on 64-bit
++  platforms.  Patch by Yogesh Chaudhari.
++
 +- Issue #18681: Fix a NameError in importlib.reload() (noticed by Weizhao Li).
 +
 +- Issue #14323: Expanded the number of digits in the coefficients for the
 +  RGB -- YIQ conversions so that they match the FCC NTSC versions.
  
  - Issue #17998: Fix an internal error in regular expression engine.
  

diff --cc Modules/_io/textio.c
Simple merge