mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge heads

Browse source
This commit is contained in:
Benjamin Peterson 2011-07-15 14:10:59 -05:00
commit 1a41d7d51d
5 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Doc/distutils/index.rst
View file

@ -20,7 +20,6 @@ very little overhead for build/release/install mechanics.
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
:numbered:
introduction.rst introduction.rst
setupscript.rst setupscript.rst

3
Doc/library/packaging.rst
View file

@ -23,7 +23,6 @@ Building blocks
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
:numbered:
packaging-misc packaging-misc
packaging.version packaging.version
@ -42,7 +41,6 @@ The command machinery
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
:numbered:
packaging.dist packaging.dist
packaging.command packaging.command
@ -55,7 +53,6 @@ Other utilities
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
:numbered:
packaging.util packaging.util
packaging.tests.pypi_server packaging.tests.pypi_server

22
Lib/test/test_concurrent_futures.py
View file

@ -623,16 +623,20 @@ class FutureTests(unittest.TestCase):
self.assertTrue(isinstance(f1.exception(timeout=5), IOError)) self.assertTrue(isinstance(f1.exception(timeout=5), IOError))
@test.support.reap_threads
def test_main(): def test_main():
test.support.run_unittest(ProcessPoolExecutorTest, try:
ThreadPoolExecutorTest, test.support.run_unittest(ProcessPoolExecutorTest,
ProcessPoolWaitTests, ThreadPoolExecutorTest,
ThreadPoolWaitTests, ProcessPoolWaitTests,
ProcessPoolAsCompletedTests, ThreadPoolWaitTests,
ThreadPoolAsCompletedTests, ProcessPoolAsCompletedTests,
FutureTests, ThreadPoolAsCompletedTests,
ProcessPoolShutdownTest, FutureTests,
ThreadPoolShutdownTest) ProcessPoolShutdownTest,
ThreadPoolShutdownTest)
finally:
test.support.reap_children()
if __name__ == "__main__": if __name__ == "__main__":
test_main() test_main()

3
Misc/NEWS
View file

@ -228,6 +228,9 @@ Core and Builtins
Library Library
------- -------
- Issue #11321: Fix a crash with multiple imports of the _pickle module when
embedding Python. Patch by Andreas Stührk.
- Issue #6755: Add get_wch() method to curses.window class. Patch by Iñigo - Issue #6755: Add get_wch() method to curses.window class. Patch by Iñigo
Serna. Serna.

2
Modules/_pickle.c
View file

@ -6338,8 +6338,10 @@ PyInit__pickle(void)
if (m == NULL) if (m == NULL)
return NULL; return NULL;
Py_INCREF(&Pickler_Type);
if (PyModule_AddObject(m, "Pickler", (PyObject *)&Pickler_Type) < 0) if (PyModule_AddObject(m, "Pickler", (PyObject *)&Pickler_Type) < 0)
return NULL; return NULL;
Py_INCREF(&Unpickler_Type);
if (PyModule_AddObject(m, "Unpickler", (PyObject *)&Unpickler_Type) < 0) if (PyModule_AddObject(m, "Unpickler", (PyObject *)&Unpickler_Type) < 0)
return NULL; return NULL;