Staging
v0.5.1
v0.5.1
https://github.com/python/cpython
Revision 934f4e1f398bb0dd712f40ecf7957327bdae33f8 authored by Ronald Oussoren on 22 June 2010, 09:18:28 UTC, committed by Ronald Oussoren on 22 June 2010, 09:18:28 UTC
* Don't import 'ic' in webbrowser, that module is no longer used * Remove 'MacOS' from the list of modules that should emit a Py3kWarning on import. This is needed because one of the earlier tests triggers and import of this extension, and that causes a failure in test_py3kwarn (running test_py3kwarn separately worked fine) With these changes 'make tests' no longer says that test_py3kwarn fails.
1 parent 4f61259
Tip revision: 934f4e1f398bb0dd712f40ecf7957327bdae33f8 authored by Ronald Oussoren on 22 June 2010, 09:18:28 UTC
Fix for issue8446:
Fix for issue8446:
Tip revision: 934f4e1
dynload_os2.c
/* Support for dynamic loading of extension modules */
#define INCL_DOSERRORS
#define INCL_DOSMODULEMGR
#include <os2.h>
#include "Python.h"
#include "importdl.h"
const struct filedescr _PyImport_DynLoadFiletab[] = {
{".pyd", "rb", C_EXTENSION},
{".dll", "rb", C_EXTENSION},
{0, 0}
};
dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
const char *pathname, FILE *fp)
{
dl_funcptr p;
APIRET rc;
HMODULE hDLL;
char failreason[256];
char funcname[258];
rc = DosLoadModule(failreason,
sizeof(failreason),
pathname,
&hDLL);
if (rc != NO_ERROR) {
char errBuf[256];
PyOS_snprintf(errBuf, sizeof(errBuf),
"DLL load failed, rc = %d: %.200s",
rc, failreason);
PyErr_SetString(PyExc_ImportError, errBuf);
return NULL;
}
PyOS_snprintf(funcname, sizeof(funcname), "init%.200s", shortname);
rc = DosQueryProcAddr(hDLL, 0L, funcname, &p);
if (rc != NO_ERROR)
p = NULL; /* Signify Failure to Acquire Entrypoint */
return p;
}
Computing file changes ...