mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 13:44:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix compilation when --without-threads is given #3683

Browse source 
Reviewer: Georg Brandl, Benjamin Peterson
This commit is contained in:
Benjamin Peterson 2008-09-01 14:18:30 +00:00
parent 2ba93210e2
commit 17f03ca962
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Misc/NEWS
View file

@ -12,6 +12,8 @@ What's New in Python 2.6 release candidate 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #3683: Fix compilation when --without-threads is given.
- Issue #3668: Fix a memory leak with the "s*" argument parser in - Issue #3668: Fix a memory leak with the "s*" argument parser in
PyArg_ParseTuple and friends, which occurred when the argument for "s*" PyArg_ParseTuple and friends, which occurred when the argument for "s*"
was correctly parsed but parsing of subsequent arguments failed. was correctly parsed but parsing of subsequent arguments failed.
@ -52,8 +54,8 @@ Library
- Fixed two format strings in the _collections module. - Fixed two format strings in the _collections module.
- #3703 _fileio.FileIO gave unhelpful error message when trying to open a - Issue #3703: _fileio.FileIO gave unhelpful error message when trying to open a
directory. directory.
Extension Modules Extension Modules
----------------- -----------------

5
Python/import.c
View file

@ -2029,7 +2029,7 @@ PyImport_ImportModuleNoBlock(const char *name)
else { else {
PyErr_Clear(); PyErr_Clear();
} }
#ifdef WITH_THREAD
/* check the import lock /* check the import lock
* me might be -1 but I ignore the error here, the lock function * me might be -1 but I ignore the error here, the lock function
* takes care of the problem */ * takes care of the problem */
@ -2045,6 +2045,9 @@ PyImport_ImportModuleNoBlock(const char *name)
name); name);
return NULL; return NULL;
} }
#else
return PyImport_ImportModule(name);
#endif
} }
/* Forward declarations for helper routines */ /* Forward declarations for helper routines */