Staging
v0.5.1
https://github.com/python/cpython
Revision 084605518d27574e7ad43d0f68a4e8cc37585d37 authored by Georg Brandl on 13 August 2009, 08:19:53 UTC, committed by Georg Brandl on 13 August 2009, 08:19:53 UTC
................
  r73594 | benjamin.peterson | 2009-06-28 01:45:02 +0200 (So, 28 Jun 2009) | 42 lines

  Merged revisions 72570,72582-72583,73027,73049,73071,73151,73247 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r72570 | michael.foord | 2009-05-11 12:59:43 -0500 (Mon, 11 May 2009) | 7 lines

    Adds a verbosity keyword argument to unittest.main plus a minor fix allowing you to specify test modules / classes
    from the command line.

    Closes issue 5995.

    Michael Foord
  ........
    r72582 | michael.foord | 2009-05-12 05:46:23 -0500 (Tue, 12 May 2009) | 1 line

    Fix to restore command line behaviour for test modules using unittest.main(). Regression caused by issue 5995. Michael
  ........
    r72583 | michael.foord | 2009-05-12 05:49:13 -0500 (Tue, 12 May 2009) | 1 line

    Better fix for modules using unittest.main(). Fixes regression caused by commit for issue 5995. Michael Foord
  ........
    r73027 | michael.foord | 2009-05-29 15:33:46 -0500 (Fri, 29 May 2009) | 1 line

    Add test discovery to unittest. Issue 6001.
  ........
    r73049 | georg.brandl | 2009-05-30 05:45:40 -0500 (Sat, 30 May 2009) | 1 line

    Rewrap a few long lines.
  ........
    r73071 | georg.brandl | 2009-05-31 09:15:25 -0500 (Sun, 31 May 2009) | 1 line

    Fix markup.
  ........
    r73151 | michael.foord | 2009-06-02 13:08:27 -0500 (Tue, 02 Jun 2009) | 1 line

    Restore default testRunner argument in unittest.main to None. Issue 6177
  ........
    r73247 | michael.foord | 2009-06-05 09:14:34 -0500 (Fri, 05 Jun 2009) | 1 line

    Fix unittest discovery tests for Windows. Issue 6199
  ........
................
  r73597 | benjamin.peterson | 2009-06-28 05:18:59 +0200 (So, 28 Jun 2009) | 20 lines

  Merged revisions 72912,72920,72940 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r72912 | benjamin.peterson | 2009-05-25 08:13:44 -0500 (Mon, 25 May 2009) | 5 lines

    add a SETUP_WITH opcode

    It speeds up the with statement and correctly looks up the special
    methods involved.
  ........
    r72920 | benjamin.peterson | 2009-05-25 15:12:57 -0500 (Mon, 25 May 2009) | 1 line

    take into account the fact that SETUP_WITH pushes a finally block
  ........
    r72940 | benjamin.peterson | 2009-05-26 07:49:59 -0500 (Tue, 26 May 2009) | 1 line

    teach the peepholer about SETUP_WITH
  ........
................
  r73611 | benjamin.peterson | 2009-06-28 17:40:50 +0200 (So, 28 Jun 2009) | 1 line

  correctly rearrange the stack in the exception case of WITH_CLEANUP
................
  r73612 | benjamin.peterson | 2009-06-28 17:55:46 +0200 (So, 28 Jun 2009) | 1 line

  update comments
................
  r73613 | benjamin.peterson | 2009-06-28 18:03:15 +0200 (So, 28 Jun 2009) | 1 line

  this is better written as an assertion
................
  r73616 | benjamin.peterson | 2009-06-28 18:17:34 +0200 (So, 28 Jun 2009) | 13 lines

  Merged revisions 73614-73615 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73614 | benjamin.peterson | 2009-06-28 11:08:02 -0500 (Sun, 28 Jun 2009) | 1 line

    add two generic macros for peeking and setting in the stack
  ........
    r73615 | benjamin.peterson | 2009-06-28 11:14:07 -0500 (Sun, 28 Jun 2009) | 1 line

    use stack macros
  ........
................
  r73617 | benjamin.peterson | 2009-06-28 18:21:52 +0200 (So, 28 Jun 2009) | 1 line

  use stack altering macros here
................
  r73620 | benjamin.peterson | 2009-06-28 18:27:27 +0200 (So, 28 Jun 2009) | 1 line

  delete unused properties
................
1 parent eb26ba2
Raw File
Tip revision: 084605518d27574e7ad43d0f68a4e8cc37585d37 authored by Georg Brandl on 13 August 2009, 08:19:53 UTC
Blocked revisions 73594,73597,73611-73613,73616-73617,73620 via svnmerge
Tip revision: 0846055
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), "PyInit_%.200s", shortname);
	rc = DosQueryProcAddr(hDLL, 0L, funcname, &p);
	if (rc != NO_ERROR)
		p = NULL; /* Signify Failure to Acquire Entrypoint */
	return p;
}
back to top