Issue #25758: Prevents zipimport from unnecessarily encoding a filename (patch by...

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

diff --cc Misc/NEWS
index 3012a974e183611f76042f8bbfe427a7675b4516,c1420e1bd8b58cdcb1f8070565a13dd17911263e..28d9bb1ba9099e5e0c861774a8e4820d1f3ca7a6
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,68 -10,9 +10,71 @@@ What's New in Python 3.6.0 beta 
  Core and Builtins
  -----------------
  
+ - Issue #25758: Prevents zipimport from unnecessarily encoding a filename
+   (patch by Eryk Sun)
+ 
 +- Issue #25856: The __module__ attribute of extension classes and functions
 +  now is interned. This leads to more compact pickle data with protocol 4.
 +
 +- Issue #27213: Rework CALL_FUNCTION* opcodes to produce shorter and more
 +  efficient bytecode. Patch by Demur Rumed, design by Serhiy Storchaka,
 +  reviewed by Serhiy Storchaka and Victor Stinner.
 +
 +- Issue #26331: Implement tokenizing support for PEP 515. Patch by Georg Brandl.
 +
 +- Issue #27999: Make "global after use" a SyntaxError, and ditto for nonlocal.
 +  Patch by Ivan Levkivskyi.
 +
 +- Issue #28003: Implement PEP 525 -- Asynchronous Generators.
 +
 +- Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations.
 +  Patch by Ivan Levkivskyi.
 +
 +- Issue #26058: Add a new private version to the builtin dict type, incremented
 +  at each dictionary creation and at each dictionary change. Implementation of
 +  the PEP 509.
 +
 +- Issue #27364: A backslash-character pair that is not a valid escape sequence
 +  now generates a DeprecationWarning.  Patch by Emanuel Barry.
 +
 +- Issue #27350: `dict` implementation is changed like PyPy. It is more compact
 +  and preserves insertion order.
 +  (Concept developed by Raymond Hettinger and patch by Inada Naoki.)
 +
 +- Issue #27911: Remove unnecessary error checks in
 +  ``exec_builtin_or_dynamic()``.
 +
 +- Issue #27078: Added BUILD_STRING opcode.  Optimized f-strings evaluation.
 +
 +- Issue #17884: Python now requires systems with inttypes.h and stdint.h
 +
 +- Issue #27961: Require platforms to support ``long long``. Python hasn't
 +  compiled without ``long long`` for years, so this is basically a formality.
 +
 +- Issue #27355: Removed support for Windows CE.  It was never finished,
 +  and Windows CE is no longer a relevant platform for Python.
 +
 +- Issue #27921: Disallow backslashes in f-strings. This is a temporary
 +  restriction: in beta 2, backslashes will only be disallowed inside
 +  the braces (where the expressions are). This is a breaking change
 +  from the 3.6 alpha releases.
 +
 +- Implement PEP 523.
 +
 +- Issue #27870: A left shift of zero by a large integer no longer attempts
 +  to allocate large amounts of memory.
 +
 +- Issue #25402: In int-to-decimal-string conversion, improve the estimate
 +  of the intermediate memory required, and remove an unnecessarily strict
 +  overflow check. Patch by Serhiy Storchaka.
 +
 +- Issue #27214: In long_invert, be more careful about modifying object
 +  returned by long_add, and remove an unnecessary check for small longs.
 +  Thanks Oren Milman for analysis and patch.
 +
 +- Issue #27506: Support passing the bytes/bytearray.translate() "delete"
 +  argument by keyword.
 +
  - Issue #27812: Properly clear out a generator's frame's backreference to the
    generator to prevent crashes in frame.clear().