[Python-checkins] r66099 - in python/trunk: Misc/NEWS Python/import.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Sep  1 16:18:30 2008
New Revision: 66099

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

Reviewer: Georg Brandl, Benjamin Peterson


Modified:
   python/trunk/Misc/NEWS
   python/trunk/Python/import.c

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Sep  1 16:18:30 2008
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Issue #3683: Fix compilation when --without-threads is given.
+
 - Issue #3668: Fix a memory leak with the "s*" argument parser in
   PyArg_ParseTuple and friends, which occurred when the argument for "s*" 
   was correctly parsed but parsing of subsequent arguments failed.
@@ -52,8 +54,8 @@
 
 - Fixed two format strings in the _collections module.
 
-- #3703 _fileio.FileIO gave unhelpful error message when trying to open a
-   directory.
+- Issue #3703: _fileio.FileIO gave unhelpful error message when trying to open a
+  directory.
 
 Extension Modules
 -----------------

Modified: python/trunk/Python/import.c
==============================================================================
--- python/trunk/Python/import.c	(original)
+++ python/trunk/Python/import.c	Mon Sep  1 16:18:30 2008
@@ -2029,7 +2029,7 @@
 	else {
 		PyErr_Clear();
 	}
-
+#ifdef WITH_THREAD
 	/* check the import lock
 	 * me might be -1 but I ignore the error here, the lock function
 	 * takes care of the problem */
@@ -2045,6 +2045,9 @@
 			     name);
 		return NULL;
 	}
+#else
+	return PyImport_ImportModule(name);
+#endif
 }
 
 /* Forward declarations for helper routines */