Issue #19440: Clean up test_capi

diff --cc Lib/test/test_capi.py
index 2ef5d4a9c9a6cc27260ee896d4e79f7f40dbf60e,9013a7b18800b41932433b842daed288008f20ba..d37c0578a3e21120feae7a045dea7728d6ef164e
--- 1/Lib/test/test_capi.py
--- 2/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@@ -416,18 -350,12 +415,13 @@@ class TestThreadState(unittest.TestCase
          t.start()
          t.join()
  
- 
- def test_main():
-     support.run_unittest(CAPITest, TestPendingCalls, Test6012,
-                          EmbeddingTests, SkipitemTest, TestThreadState,
-                          SubinterpreterTest)
- 
-     for name in dir(_testcapi):
-         if name.startswith('test_'):
-             test = getattr(_testcapi, name)
-             if support.verbose:
-                 print("internal", name)
-             test()
+ class Test_testcapi(unittest.TestCase):
+     def test__testcapi(self):
+         for name in dir(_testcapi):
+             if name.startswith('test_'):
 -                test = getattr(_testcapi, name)
 -                test()
++                with self.subTest("internal", name=name):
++                    test = getattr(_testcapi, name)
++                    test()
  
  if __name__ == "__main__":
-     test_main()
+     unittest.main()

diff --cc Misc/NEWS
index d5a5b59ec49d727b37b2d13b36f52eab8d82c4ba,b09f4d116e9154db533d8b2eb8a6648a4f343e73..3c1ee634a54a0f9d057adab7bc8950eddb6b8399
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -208,103 -191,6 +208,107 @@@ Librar
    limiting the call to readline().  Original patch by Michał
    Jastrzębski and Giampaolo Rodola.
  
 +- Issue #17087: Improved the repr for regular expression match objects.
 +
 +Tests
 +-----
 +
++- Issue #19440: Clean up test_capi by removing an unnecessary __future__
++  import, converting from test_main to unittest.main, and running the
++  _testcapi module tests as subTests of a unittest TestCase method.
++
 +- Issue #19378: the main dis module tests are now run with both stdout
 +  redirection *and* passing an explicit file parameter
 +
 +- Issue #19378: removed the not-actually-helpful assertInstructionMatches
 +  and assertBytecodeExactlyMatches helpers from bytecode_helper
 +
 +- Issue #18702: All skipped tests now reported as skipped.
 +
 +- Issue #19439: interpreter embedding tests are now executed on Windows
 +  (Patch by Zachary Ware)
 +
 +- Issue #19085: Added basic tests for all tkinter widget options.
 +
 +- Issue 19384: Fix test_py_compile for root user, patch by Claudiu Popa.
 +
 +Build
 +-----
 +
 +- Issue #19356: Avoid using a C variabled named "_self", it's a reserved
 +  word in some C compilers.
 +
 +- Issue #15792: Correct build options on Win64. Patch by Jeremy Kloth.
 +
 +- Issue #19373: Apply upstream change to Tk 8.5.15 fixing OS X 10.9
 +  screen refresh problem for OS X installer build.
 +
 +Tools/Demos
 +-----------
 +
 +- Issue #19390: Argument Clinic no longer accepts malformed Python
 +  and C ids.
 +
 +What's New in Python 3.4.0 Alpha 4?
 +===================================
 +
 +Release date: 2013-10-20
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #19301: Give classes and functions that are explicitly marked global a
 +  global qualname.
 +
 +- Issue #19279: UTF-7 decoder no longer produces illegal strings.
 +
 +- Issue #16612: Add "Argument Clinic", a compile-time preprocessor for
 +  C files to generate argument parsing code.  (See PEP 436.)
 +
 +- 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 #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 #4555: All exported C symbols are now prefixed with either
 +  "Py" or "_Py".
 +
 +- 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.