summaryrefslogtreecommitdiffstats
path: root/Python/import.c
diff options
context:
space:
mode:
authorSjoerd Mullender <sjoerd@acm.org>1995-06-12 15:51:34 (GMT)
committerSjoerd Mullender <sjoerd@acm.org>1995-06-12 15:51:34 (GMT)
commitfbe6d33ffd64ce1b31b2dab332c617f96b5e3fbf (patch)
tree11b00b4887570fe6c5105b3e2d210036e3c5651d /Python/import.c
parent7d0bc8343f55f2e467abb2ce50b76b054897d72f (diff)
downloadcpython-fbe6d33ffd64ce1b31b2dab332c617f96b5e3fbf.zip
cpython-fbe6d33ffd64ce1b31b2dab332c617f96b5e3fbf.tar.gz
cpython-fbe6d33ffd64ce1b31b2dab332c617f96b5e3fbf.tar.bz2
Check if we've already loaded a dynamic module under a different name.
Diffstat (limited to 'Python/import.c')
-rw-r--r--Python/import.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/import.c b/Python/import.c
index 155ce34..6eeefdf 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -487,7 +487,7 @@ load_module(name)
break;
case C_EXTENSION:
- m = load_dynamic_module(name, buf);
+ m = load_dynamic_module(name, buf, fp);
break;
#ifdef macintosh
@@ -868,7 +868,7 @@ imp_load_dynamic(self, args)
object *dummy;
if (!newgetargs(args, "ss|O", &name, &pathname, &dummy))
return NULL;
- return load_dynamic_module(name, pathname);
+ return load_dynamic_module(name, pathname, NULL);
}
static object *