(Merge 3.2) Issue #12100: Don't reset incremental encoders of CJK codecs at

each call to their encode() method anymore, but continue to call the reset()
method if the final argument is True.

diff --cc Misc/NEWS
index 8dad4f2d3232479252f993cbdc894a6ad0c4382c,bca13127d4be0d9e922c70f6ac698a909cf59ed3..7b143f3ae79bea81e0c339b2616fe31e55074766
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -161,98 -195,8 +161,102 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch by
 -  Kasun Herath.
++- Issue #12100: Don't reset incremental encoders of CJK codecs at each call to
++  their encode() method anymore, but continue to call the reset() method if the
++  final argument is True.
++
 +- Issue #12049: Add RAND_bytes() and RAND_pseudo_bytes() functions to the ssl
 +  module.
 +
 +- Issue #12125: fixed the failures under Solaris due to improper test cleanup.
 +
 +- Issue #6501: os.device_encoding() returns None on Windows if the application
 +  has no console.
 +
 +- Issue #12132: Skip test_build_ext in case the xxmodule is not found.
 +
 +- Issue #12105: Add O_CLOEXEC to the os module.
 +
 +- Issue #12079: Decimal('Infinity').fma(Decimal('0'), (3.91224318126786e+19+0j))
 +  now raises TypeError (reflecting the invalid type of the 3rd argument) rather
 +  than Decimal.InvalidOperation.
 +
 +- Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore
 +  to be able to unload the module.
 +
 +- Issue #12120, #12119: skip a test in packaging and distutils
 +  if sys.dont_write_bytecode is set to True.
 +
 +- Issue #12065: connect_ex() on an SSL socket now returns the original errno
 +  when the socket's timeout expires (it used to return None).
 +
 +- Issue #8809: The SMTP_SSL constructor and SMTP.starttls() now support
 +  passing a ``context`` argument pointing to an ssl.SSLContext instance.
 +  Patch by Kasun Herath.
 +
 +- Issue #11088: don't crash when using F5 to run a script in IDLE on MacOSX
 +  with Tk 8.5.
 +
 +- Issue #9516: Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET
 +  is set in shell.
 +
 +- Issue #8650: Make zlib module 64-bit clean. compress(), decompress() and
 +  their incremental counterparts now raise OverflowError if given an input
 +  larger than 4GB, instead of silently truncating the input and returning
 +  an incorrect result.
 +
 +- Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
 +  attribute when called without a max_length argument.
 +
 +- Issue #12062: Fix a flushing bug when doing a certain type of I/O sequence
 +  on a file opened in read+write mode (namely: reading, seeking a bit forward,
 +  writing, then seeking before the previous write but still within buffered
 +  data, and writing again).
 +
 +- Issue #9971: Write an optimized implementation of BufferedReader.readinto().
 +  Patch by John O'Connor.
 +
 +- Issue #1028: Tk returns invalid Unicode null in %A: UnicodeDecodeError.
 +  With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused
 +  IDLE to exit.  Converted to valid Unicode null in PythonCmd().
 +
 +- Issue #11799: urllib.request Authentication Handlers will raise a ValueError
 +  when presented with an unsupported Authentication Scheme. Patch contributed
 +  by Yuval Greenfield.
 +
 +- Issue #10419, #6011: build_scripts command of distutils handles correctly
 +  non-ASCII path (path to the Python executable). Open and write the script in
 +  binary mode, but ensure that the shebang is decodable from UTF-8 and from the
 +  encoding of the script.
 +
 +- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in
 +  order to accept exactly one connection.  Patch by Daniel Evers.
 +
 +- Issue #12011: signal.signal() and signal.siginterrupt() raise an OSError,
 +  instead of a RuntimeError: OSError has an errno attribute.
 +
 +- Issue #3709: a flush_headers method to BaseHTTPRequestHandler which manages
 +  the sending of headers to output stream and flushing the internal headers
 +  buffer. Patch contribution by Andrew Schaaf
 +
 +- Issue #11743: Rewrite multiprocessing connection classes in pure Python.
 +
 +- Issue #11164: Stop trying to use _xmlplus in the xml module.
 +
 +- Issue #11888: Add log2 function to math module. Patch written by Mark
 +  Dickinson.
 +
 +- Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional.
 +
 +- Issue #8407: The signal handler writes the signal number as a single byte
 +  instead of a nul byte into the wakeup file descriptor. So it is possible to
 +  wait more than one signal and know which signals were raised.
 +
 +- Issue #8407: Add pthread_kill(), sigpending() and sigwait() functions to the
 +  signal module.
 +
 +- Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch
 +  by Kasun Herath.
  
  - Issue #12002: ftplib's abort() method raises TypeError.
  

diff --cc Modules/cjkcodecs/multibytecodec.c
Simple merge