diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2012-02-20 18:50:33 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2012-02-20 18:50:33 (GMT) |
| commit | 5743691b878b03352f4473d862c656b3de442bcf (patch) | |
| tree | 33afd64e69304e14e76e8d442abc9fcfe8f0429c /Python | |
| parent | aa8a62dcc0351282c418bc7be540b1fff113df43 (diff) | |
| parent | c229e6e8ff6de61581f59266dc553f04f2c870c3 (diff) | |
| download | cpython-5743691b878b03352f4473d862c656b3de442bcf.zip cpython-5743691b878b03352f4473d862c656b3de442bcf.tar.gz cpython-5743691b878b03352f4473d862c656b3de442bcf.tar.bz2 | |
Merged upstream changes.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/dynload_aix.c | 1 | ||||
| -rw-r--r-- | Python/dynload_dl.c | 1 | ||||
| -rw-r--r-- | Python/dynload_hpux.c | 1 | ||||
| -rw-r--r-- | Python/dynload_next.c | 1 | ||||
| -rw-r--r-- | Python/dynload_shlib.c | 6 |
5 files changed, 0 insertions, 10 deletions
diff --git a/Python/dynload_aix.c b/Python/dynload_aix.c index 6287c86..8346f06 100644 --- a/Python/dynload_aix.c +++ b/Python/dynload_aix.c @@ -28,7 +28,6 @@ typedef struct Module { const struct filedescr _PyImport_DynLoadFiletab[] = { {".so", "rb", C_EXTENSION}, - {"module.so", "rb", C_EXTENSION}, {0, 0} }; diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c index 37519b2..a914a08 100644 --- a/Python/dynload_dl.c +++ b/Python/dynload_dl.c @@ -11,7 +11,6 @@ extern char *Py_GetProgramName(void); const struct filedescr _PyImport_DynLoadFiletab[] = { {".o", "rb", C_EXTENSION}, - {"module.o", "rb", C_EXTENSION}, {0, 0} }; diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c index 3ebbbad..1004010 100644 --- a/Python/dynload_hpux.c +++ b/Python/dynload_hpux.c @@ -15,7 +15,6 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { {SHLIB_EXT, "rb", C_EXTENSION}, - {"module"SHLIB_EXT, "rb", C_EXTENSION}, {0, 0} }; diff --git a/Python/dynload_next.c b/Python/dynload_next.c index eb17950..5caff8b 100644 --- a/Python/dynload_next.c +++ b/Python/dynload_next.c @@ -10,7 +10,6 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { {".so", "rb", C_EXTENSION}, - {"module.so", "rb", C_EXTENSION}, {0, 0} }; diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c index 1c215c3..ab24238 100644 --- a/Python/dynload_shlib.c +++ b/Python/dynload_shlib.c @@ -39,7 +39,6 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { #ifdef __CYGWIN__ {".dll", "rb", C_EXTENSION}, - {"module.dll", "rb", C_EXTENSION}, #else /* !__CYGWIN__ */ #if defined(PYOS_OS2) && defined(PYCC_GCC) {".pyd", "rb", C_EXTENSION}, @@ -48,15 +47,10 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { #ifdef __VMS {".exe", "rb", C_EXTENSION}, {".EXE", "rb", C_EXTENSION}, - {"module.exe", "rb", C_EXTENSION}, - {"MODULE.EXE", "rb", C_EXTENSION}, #else /* !__VMS */ {"." SOABI ".so", "rb", C_EXTENSION}, - {"module." SOABI ".so", "rb", C_EXTENSION}, {".abi" PYTHON_ABI_STRING ".so", "rb", C_EXTENSION}, - {"module.abi" PYTHON_ABI_STRING ".so", "rb", C_EXTENSION}, {".so", "rb", C_EXTENSION}, - {"module.so", "rb", C_EXTENSION}, #endif /* __VMS */ #endif /* defined(PYOS_OS2) && defined(PYCC_GCC) */ #endif /* __CYGWIN__ */ |