merge 3.4 (closes #22518)

diff --cc Misc/NEWS
index 77a27251d9493923c039b5709328146d96905fc1,3d13192480a550af4db2d5a21561f384c4500584..3574e420aab91e1d3bf23bf9079101502c827840
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,23 -9,66 +10,85 @@@ Release date: TB
  Core and Builtins
  -----------------
  
+ - Issue #22518: Fix integer overflow issues in latin-1 encoding.
+ 
 +- Issue #16324: _charset parameter of MIMEText now also accepts
 +  email.charset.Charset instances. Initial patch by Claude Paroz.
 +
 +- Issue #1764286: Fix inspect.getsource() to support decorated functions.
 +  Patch by Claudiu Popa.
 +
 +- Issue #18554: os.__all__ includes posix functions.
 +
 +- Issue #21391: Use os.path.abspath in the shutil module.
 +
 +- Issue #11471: avoid generating a JUMP_FORWARD instruction at the end of
 +  an if-block if there is no else-clause.  Original patch by Eugene Toder.
 +
 +- Issue #22215: Now ValueError is raised instead of TypeError when str or bytes
 +  argument contains not permitted null character or byte.
 +
 +- Issue #22258: Fix the internal function set_inheritable() on Illumos.
++
+ Library
+ -------
+ 
+ - Issue #22448: Improve canceled timer handles cleanup to prevent
+   unbound memory usage. Patch by Joshua Moore-Oliva.
+ 
+ Build
+ -----
+ 
+ - Issue #16537: Check whether self.extensions is empty in setup.py. Patch by
+   Jonathan Hosmer.
+ 
+ 
+ What's New in Python 3.4.2?
+ ===========================
+ 
+ Release date: 2014-10-06
+ 
+ Core and Builtins
+ -----------------
+ 
+ Library
+ -------
+ 
+ - Issue #10510: distutils register and upload methods now use HTML standards
+   compliant CRLF line endings.
+ 
+ - Issue #9850: Fixed macpath.join() for empty first component.  Patch by
+   Oleg Oshmyan.
+ 
+ - Issue #22427: TemporaryDirectory no longer attempts to clean up twice when
+   used in the with statement in generator.
+ 
+ - Issue #20912: Now directories added to ZIP file have correct Unix and MS-DOS
+   directory attributes.
+ 
+ - Issue #21866: ZipFile.close() no longer writes ZIP64 central directory
+   records if allowZip64 is false.
+ 
+ - Issue #22415: Fixed debugging output of the GROUPREF_EXISTS opcode in the re
+   module.  Removed trailing spaces in debugging output.
+ 
+ - Issue #22423: Unhandled exception in thread no longer causes unhandled
+   AttributeError when sys.stderr is None.
+ 
+ - Issue #21332: Ensure that ``bufsize=1`` in subprocess.Popen() selects
+   line buffering, rather than block buffering.  Patch by Akira Li.
+ 
+ 
+ What's New in Python 3.4.2rc1?
+ ==============================
+ 
+ Release date: 2014-09-22
+ 
+ Core and Builtins
+ -----------------
+ 
+ - Issue #22258: Fix the the internal function set_inheritable() on Illumos.
++>>>>>>> other
    This platform exposes the function ``ioctl(FIOCLEX)``, but calling it fails
    with errno is ENOTTY: "Inappropriate ioctl for device". set_inheritable()
    now falls back to the slower ``fcntl()`` (``F_GETFD`` and then ``F_SETFD``).

diff --cc Objects/unicodeobject.c
Simple merge