merge from 3.3: Increase the test coverage of macurl2path module. Patch by Colin...

diff --cc Lib/test/test_sundry.py
index 77ec9f0178127b254c3065ea6f71b18020721b68,e08cf0179d538c31f241cf66f1ac95c388d6a2aa..2da3ac05dc754380367e51665f3c3e48818f148e
--- 1/Lib/test/test_sundry.py
--- 2/Lib/test/test_sundry.py
+++ b/Lib/test/test_sundry.py
@@@ -5,18 -5,10 +5,18 @@@ from test import suppor
  import unittest
  
  class TestUntestedModules(unittest.TestCase):
 -    def test_at_least_import_untested_modules(self):
 +    def test_untested_modules_can_be_imported(self):
 +        untested = ('bdb', 'encodings', 'formatter', 'imghdr',
-                     'macurl2path', 'nturl2path', 'tabnanny')
++                    'nturl2path', 'tabnanny')
          with support.check_warnings(quiet=True):
 -            import bdb
 -            import cgitb
 +            for name in untested:
 +                try:
 +                    support.import_module('test.test_{}'.format(name))
 +                except unittest.SkipTest:
 +                    importlib.import_module(name)
 +                else:
 +                    self.fail('{} has tests even though test_sundry claims '
 +                              'otherwise'.format(name))
  
              import distutils.bcppcompiler
              import distutils.ccompiler
@@@ -46,9 -39,21 +46,10 @@@
              import distutils.command.sdist
              import distutils.command.upload
  
 -            import encodings
 -            import formatter
 -            import getpass
              import html.entities
 -            import imghdr
 -            import keyword
 -            import mailcap
 -            import nturl2path
 -            import os2emxpath
 -            import pstats
 -            import py_compile
 -            import sndhdr
 -            import tabnanny
++
              try:
 -                import tty     # not available on Windows
 +                import tty  # Not available on Windows
              except ImportError:
                  if support.verbose:
                      print("skipping tty")

diff --cc Misc/NEWS
index 0770d3f3e77ba3c493d4494ec55833aea23ef7ed,58745f9fd88d233ddfc3685f781440116770a0d6..2c0430c2281287285395a920ae1fe5bacf922455
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,114 -15,87 +13,117 @@@ Core and Builtin
  - Issue #18603: Ensure that PyOS_mystricmp and PyOS_mystrnicmp are in the
    Python executable and not removed by the linker's optimizer.
  
 -- Issue #19279: UTF-7 decoder no more produces illegal strings.
 +- Issue #19306: Add extra hints to the faulthandler module's stack
 +  dumps that these are "upside down".
  
 -- Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at
 -  least one place so as to avoid regressions.
 +Library
 +-------
  
 -- Issue #19014: memoryview.cast() is now allowed on zero-length views.
++- Issue #19350: Increasing the test coverage of macurl2path. Patch by Colin
++  Williams.
+ 
 -- Issue #19098: Prevent overflow in the compiler when the recursion limit is set
 -  absurdly high.
 +- Issue #19365: Optimized the parsing of long replacement string in re.sub*()
 +  functions.
  
 -- Issue #18942: sys._debugmallocstats() output was damaged on Windows.
 +- Issue #19352: Fix unittest discovery when a module can be reached
 +  through several paths (e.g. under Debian/Ubuntu with virtualenv).
  
 -- Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.
 +- Issue #15207: Fix mimetypes to read from correct part of Windows registry
 +  Original patch by Dave Chambers
  
 -- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
 -  fails.
 +- Issue #16595: Add prlimit() to resource module.
  
 -- Issue #16741: Fix an error reporting in int().
 +- Issue #19324: Expose Linux-specific constants in resource module.
  
 -- Issue #17899: Fix rare file descriptor leak in os.listdir().
 +- Issue #17400: ipaddress should make it easy to identify rfc6598 addresses.
  
 -- Issue #18552: Check return value of PyArena_AddPyObject() in
 -  obj2ast_object().
 +- Load SSL's error strings in hashlib.
  
 -- Issue #18560: Fix potential NULL pointer dereference in sum().
 +- Issue #18527: Upgrade internal copy of zlib to 1.2.8.
  
 -- Issue #15905: Fix theoretical buffer overflow in handling of sys.argv[0],
 -  prefix and exec_prefix if the operation system does not obey MAXPATHLEN.
 +- Issue #19274: Add a filterfunc parameter to PyZipFile.writepy.
  
 -- Issue #18344: Fix potential ref-leaks in _bufferedreader_read_all().
 +- Issue #8964: fix platform._sys_version to handle IronPython 2.6+.
 +  Patch by Martin Matusiak.
  
 -- Issue #17872: Fix a segfault in marshal.load() when input stream returns
 -  more bytes than requested.
 +- Issue #18958: Improve error message for json.load(s) while passing a string
 +  that starts with a UTF-8 BOM.
  
 -- Issue #18426: Fix NULL pointer dereference in C extension import when
 -  PyModule_GetDef() returns an error.
 +- Issue #19307: Improve error message for json.load(s) while passing objects
 +  of the wrong type.
  
 -- Issue #18328: Reorder ops in PyThreadState_Delete*() functions. Now the
 -  tstate is first removed from TLS and then deallocated.
 +- Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by
 +  limiting the call to readline().  Original patch by Michał
 +  Jastrzębski and Giampaolo Rodola.
  
 -- Issue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
 -  OverflowError when an argument of %c format is out of range.
 +- Issue #17087: Improved the repr for regular expression match objects.
  
 -- Issue #18137: Detect integer overflow on precision in float.__format__()
 -  and complex.__format__().
 +Build
 +-----
  
 -- Issue #18183: Fix various unicode operations on strings with large unicode
 -  codepoints.
 +- Issue #19356: Avoid using a C variabled named "_self", it's a reserved
 +  word in some C compilers.
  
 -- Issue #18180: Fix ref leak in _PyImport_GetDynLoadWindows().
  
 -- Issue #18038: SyntaxError raised during compilation sources with illegal
 -  encoding now always contains an encoding name.
 +What's New in Python 3.4.0 Alpha 4?
 +===================================
  
 -- Issue #17644: Fix a crash in str.format when curly braces are used in square
 -  brackets.
 +Release date: 2013-10-20
  
 -- Issue #17983: Raise a SyntaxError for a ``global __class__`` statement in a
 -  class body.
 +Core and Builtins
 +-----------------
  
 -- Issue #17927: Frame objects kept arguments alive if they had been copied into
 -  a cell, even if the cell was cleared.
 +- Issue #19301: Give classes and functions that are explicitly marked global a
 +  global qualname.
  
 -Library
 --------
 +- Issue #19279: UTF-7 decoder no longer produces illegal strings.
  
 -- Issue #19350: Increasing the test coverage of macurl2path. Patch by Colin
 -  Williams.
 +- Issue #16612: Add "Argument Clinic", a compile-time preprocessor for
 +  C files to generate argument parsing code.  (See PEP 436.)
  
 -- Issue #19352: Fix unittest discovery when a module can be reached
 -  through several paths (e.g. under Debian/Ubuntu with virtualenv).
 +- Issue #18810: Shift stat calls in importlib.machinery.FileFinder such that
 +  the code is optimistic that if something exists in a directory named exactly
 +  like the possible package being searched for that it's in actuality a
 +  directory.
  
 -- Issue #15207: Fix mimetypes to read from correct part of Windows registry
 -  Original patch by Dave Chambers
 +- Issue #18416: importlib.machinery.PathFinder now treats '' as the cwd and
 +  importlib.machinery.FileFinder no longer special-cases '' to '.'. This leads
 +  to modules imported from cwd to now possess an absolute file path for
 +  __file__ (this does not affect modules specified by path on the CLI but it
 +  does affect -m/runpy). It also allows FileFinder to be more consistent by not
 +  having an edge case.
  
 -- Issue #8964: fix platform._sys_version to handle IronPython 2.6+.
 -  Patch by Martin Matusiak.
 +- Issue #4555: All exported C symbols are now prefixed with either
 +  "Py" or "_Py".
  
 -- Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by
 -  limiting the call to readline().  Original patch by Michał
 -  Jastrzębski and Giampaolo Rodola.
 +- Issue #19219: Speed up marshal.loads(), and make pyc files slightly
 +  (5% to 10%) smaller.
 +
 +- Issue #19221: Upgrade Unicode database to version 6.3.0.
 +
 +- Issue #16742: The result of the C callback PyOS_ReadlineFunctionPointer must
 +  now be a string allocated by PyMem_RawMalloc() or PyMem_RawRealloc() (or NULL
 +  if an error occurred), instead of a string allocated by PyMem_Malloc() or
 +  PyMem_Realloc().
 +
 +- Issue #19199: Remove ``PyThreadState.tick_counter`` field
 +
 +- Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at
 +  least one place so as to avoid regressions.
 +
 +- Issue #19087: Improve bytearray allocation in order to allow cheap popping
 +  of data at the front (slice deletion).
 +
 +- Issue #19014: memoryview.cast() is now allowed on zero-length views.
 +
 +- Issue #18690: memoryview is now automatically registered with
 +  collections.abc.Sequence
 +
 +- Issue #19078: memoryview now correctly supports the reversed builtin
 +  (Patch by Claudiu Popa)
 +
 +Library
 +-------
  
  - Issue #18235: Fix the sysconfig variables LDSHARED and BLDSHARED under AIX.
    Patch by David Edelsohn.