More PyImport_ImportModule -> PyImport_ImportModuleNoBlock

christian.heimes · christian.heimes · commit 286d5e9f3ff0 · 2008-01-03T23:05:47.000Z
git-svn-id: http://svn.python.org/projects/python/branches/py3k@59681 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
@@ -452,7 +452,7 @@ fp_setreadl(struct tok_state *tok, const char* enc)
 {
 	PyObject *readline = NULL, *stream = NULL, *io = NULL;
 
-	io = PyImport_ImportModule("io");
+	io = PyImport_ImportModuleNoBlock("io");
 	if (io == NULL)
 		goto cleanup;
 
diff --git a/Python/ast.c b/Python/ast.c
@@ -56,7 +56,7 @@ new_identifier(const char* n, PyArena *arena)
        identifier; if so, normalize to NFKC. */
     for (; *u; u++) {
 	if (*u >= 128) {
-	    PyObject *m = PyImport_ImportModule("unicodedata");
+	    PyObject *m = PyImport_ImportModuleNoBlock("unicodedata");
 	    PyObject *id2;
 	    if (!m)
 		return NULL;
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -281,7 +281,7 @@ static PyObject *
 builtin_filter(PyObject *self, PyObject *args)
 {
 	PyObject *itertools, *ifilter, *result;
-	itertools = PyImport_ImportModule("itertools");
+	itertools = PyImport_ImportModuleNoBlock("itertools");
 	if (itertools == NULL)
 		return NULL;
 	ifilter = PyObject_GetAttrString(itertools, "ifilter");
@@ -796,7 +796,7 @@ static PyObject *
 builtin_map(PyObject *self, PyObject *args)
 {
 	PyObject *itertools, *imap, *result;
-	itertools = PyImport_ImportModule("itertools");
+	itertools = PyImport_ImportModuleNoBlock("itertools");
 	if (itertools == NULL)
 		return NULL;
 	imap = PyObject_GetAttrString(itertools, "imap");
diff --git a/Python/codecs.c b/Python/codecs.c
@@ -850,7 +850,7 @@ static int _PyCodecRegistry_Init(void)
 	interp->codec_error_registry == NULL)
 	Py_FatalError("can't initialize codec registry");
 
-    mod = PyImport_ImportModuleLevel("encodings", NULL, NULL, NULL, 0);
+    mod = PyImport_ImportModuleNoBlock("encodings");
     if (mod == NULL) {
 	if (PyErr_ExceptionMatches(PyExc_ImportError)) {
 	    /* Ignore ImportErrors... this is done so that

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ fp_setreadl(struct tok_state tok, const char enc)`
`452`	`452`	`{`
`453`	`453`	`PyObject readline = NULL, stream = NULL, *io = NULL;`
`454`	`454`
`455`		`- io = PyImport_ImportModule("io");`
	`455`	`+ io = PyImport_ImportModuleNoBlock("io");`
`456`	`456`	`if (io == NULL)`
`457`	`457`	`goto cleanup;`
`458`	`458`