mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	 e7ba495627
			
		
	
	
		e7ba495627
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
  r55636 | neal.norwitz | 2007-05-29 00:06:39 -0700 (Tue, 29 May 2007) | 149 lines
  Merged revisions 55506-55635 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r55507 | georg.brandl | 2007-05-22 07:28:17 -0700 (Tue, 22 May 2007) | 2 lines
    Remove the "panel" module doc file which has been ignored since 1994.
  ........
    r55522 | mark.hammond | 2007-05-22 19:04:28 -0700 (Tue, 22 May 2007) | 4 lines
    Remove definition of PY_UNICODE_TYPE from pyconfig.h, allowing the
    definition in unicodeobject.h to be used, giving us the desired
    wchar_t in place of 'unsigned short'.  As discussed on python-dev.
  ........
    r55525 | neal.norwitz | 2007-05-22 23:35:32 -0700 (Tue, 22 May 2007) | 6 lines
    Add -3 option to the interpreter to warn about features that are
    deprecated and will be changed/removed in Python 3.0.
    This patch is mostly from Anthony.  I tweaked some format and added
    a little doc.
  ........
    r55527 | neal.norwitz | 2007-05-22 23:57:35 -0700 (Tue, 22 May 2007) | 1 line
    Whitespace cleanup
  ........
    r55528 | neal.norwitz | 2007-05-22 23:58:36 -0700 (Tue, 22 May 2007) | 1 line
    Add a bunch more deprecation warnings for builtins that are going away in 3.0
  ........
    r55549 | georg.brandl | 2007-05-24 09:49:29 -0700 (Thu, 24 May 2007) | 2 lines
    shlex.split() now has an optional "posix" parameter.
  ........
    r55550 | georg.brandl | 2007-05-24 10:33:33 -0700 (Thu, 24 May 2007) | 2 lines
    Fix parameter passing.
  ........
    r55555 | facundo.batista | 2007-05-24 10:50:54 -0700 (Thu, 24 May 2007) | 6 lines
    Added an optional timeout parameter to urllib.ftpwrapper, with tests
    (for this and a basic one, because there weren't any). Changed also
    NEWS, but didn't find documentation for this function, assumed it
    wasn't public...
  ........
    r55563 | facundo.batista | 2007-05-24 13:01:59 -0700 (Thu, 24 May 2007) | 4 lines
    Removed the .recv() in the test, is not necessary, and was
    causing problems that didn't have anything to do with was
    actually being tested...
  ........
    r55564 | facundo.batista | 2007-05-24 13:51:19 -0700 (Thu, 24 May 2007) | 5 lines
    Let's see if reading exactly what is written allow this live
    test to pass (now I know why there were so few tests in ftp,
    http, etc, :( ).
  ........
    r55567 | facundo.batista | 2007-05-24 20:10:28 -0700 (Thu, 24 May 2007) | 4 lines
    Trying to make the tests work in Windows and Solaris, everywhere
    else just works
  ........
    r55568 | facundo.batista | 2007-05-24 20:47:19 -0700 (Thu, 24 May 2007) | 4 lines
    Fixing stupid error, and introducing a sleep, to see if the
    other thread is awakened and finish sending data.
  ........
    r55569 | facundo.batista | 2007-05-24 21:20:22 -0700 (Thu, 24 May 2007) | 4 lines
    Commenting out the tests until find out who can test them in
    one of the problematic enviroments.
  ........
    r55570 | neal.norwitz | 2007-05-24 22:13:40 -0700 (Thu, 24 May 2007) | 2 lines
    Get test passing again by commenting out the reference to the test class.
  ........
    r55575 | vinay.sajip | 2007-05-25 00:05:59 -0700 (Fri, 25 May 2007) | 1 line
    Updated docstring for SysLogHandler (#1720726).
  ........
    r55576 | vinay.sajip | 2007-05-25 00:06:55 -0700 (Fri, 25 May 2007) | 1 line
    Updated documentation for SysLogHandler (#1720726).
  ........
    r55592 | brett.cannon | 2007-05-25 13:17:15 -0700 (Fri, 25 May 2007) | 3 lines
    Remove direct call's to file's constructor and replace them with calls to
    open() as ths is considered best practice.
  ........
    r55601 | kristjan.jonsson | 2007-05-26 12:19:50 -0700 (Sat, 26 May 2007) | 1 line
    Remove the rgbimgmodule from PCBuild8
  ........
    r55602 | kristjan.jonsson | 2007-05-26 12:31:39 -0700 (Sat, 26 May 2007) | 1 line
    Include <windows.h> after python.h, so that WINNT is properly set before windows.h is included.  Fixes warnings in PC builds.
  ........
    r55603 | walter.doerwald | 2007-05-26 14:04:13 -0700 (Sat, 26 May 2007) | 2 lines
    Fix typo.
  ........
    r55604 | peter.astrand | 2007-05-26 15:18:20 -0700 (Sat, 26 May 2007) | 1 line
    Applied patch 1669481, slightly modified: Support close_fds on Win32
  ........
    r55606 | neal.norwitz | 2007-05-26 21:08:54 -0700 (Sat, 26 May 2007) | 2 lines
    Add the new function object attribute names from py3k.
  ........
    r55617 | lars.gustaebel | 2007-05-27 12:49:30 -0700 (Sun, 27 May 2007) | 20 lines
    Added errors argument to TarFile class that allows the user to
    specify an error handling scheme for character conversion. Additional
    scheme "utf-8" in read mode. Unicode input filenames are now
    supported by design. The values of the pax_headers dictionary are now
    limited to unicode objects.
    Fixed: The prefix field is no longer used in PAX_FORMAT (in
    conformance with POSIX).
    Fixed: In read mode use a possible pax header size field.
    Fixed: Strip trailing slashes from pax header name values.
    Fixed: Give values in user-specified pax_headers precedence when
    writing.
    Added unicode tests. Added pax/regtype4 member to testtar.tar all
    possible number fields in a pax header.
    Added two chapters to the documentation about the different formats
    tarfile.py supports and how unicode issues are handled.
  ........
    r55618 | raymond.hettinger | 2007-05-27 22:23:22 -0700 (Sun, 27 May 2007) | 1 line
    Explain when groupby() issues a new group.
  ........
    r55634 | martin.v.loewis | 2007-05-28 21:01:29 -0700 (Mon, 28 May 2007) | 2 lines
    Test pre-commit hook for a link to a .py file.
  ........
    r55635 | martin.v.loewis | 2007-05-28 21:02:03 -0700 (Mon, 28 May 2007) | 2 lines
    Revert 55634.
  ........
................
  r55639 | neal.norwitz | 2007-05-29 00:58:11 -0700 (Tue, 29 May 2007) | 1 line
  Remove sys.exc_{type,exc_value,exc_traceback}
................
  r55641 | neal.norwitz | 2007-05-29 01:03:50 -0700 (Tue, 29 May 2007) | 1 line
  Missed one sys.exc_type.  I wonder why exc_{value,traceback} were already gone
................
  r55642 | neal.norwitz | 2007-05-29 01:08:33 -0700 (Tue, 29 May 2007) | 1 line
  Missed more doc for sys.exc_* attrs.
................
  r55643 | neal.norwitz | 2007-05-29 01:18:19 -0700 (Tue, 29 May 2007) | 1 line
  Remove sys.exc_clear()
................
  r55665 | guido.van.rossum | 2007-05-29 19:45:43 -0700 (Tue, 29 May 2007) | 4 lines
  Make None, True, False keywords.
  We can now also delete all the other places that explicitly forbid
  assignment to None, but I'm not going to bother right now.
................
  r55666 | guido.van.rossum | 2007-05-29 20:01:51 -0700 (Tue, 29 May 2007) | 3 lines
  Found another place that needs check for forbidden names.
  Fixed test_syntax.py accordingly (it helped me find that one).
................
  r55668 | guido.van.rossum | 2007-05-29 20:41:48 -0700 (Tue, 29 May 2007) | 2 lines
  Mark None, True, False as keywords.
................
  r55673 | neal.norwitz | 2007-05-29 23:28:25 -0700 (Tue, 29 May 2007) | 3 lines
  Get the dis module working on modules again after changing dicts
  to not return lists and also new-style classes.  Add a test.
................
  r55674 | neal.norwitz | 2007-05-29 23:35:45 -0700 (Tue, 29 May 2007) | 1 line
  Umm, it helps to add the module that the test uses
................
  r55675 | neal.norwitz | 2007-05-29 23:53:05 -0700 (Tue, 29 May 2007) | 4 lines
  Try to fix up all the other places that were assigning to True/False.
  There's at least one more problem in test.test_xmlrpc.  I have other
  changes in that file and that should be fixed soon (I hope).
................
  r55679 | neal.norwitz | 2007-05-30 00:31:55 -0700 (Wed, 30 May 2007) | 1 line
  Fix up another place that was assigning to True/False.
................
  r55688 | brett.cannon | 2007-05-30 14:19:47 -0700 (Wed, 30 May 2007) | 2 lines
  Ditch MimeWriter.
................
  r55692 | brett.cannon | 2007-05-30 14:52:00 -0700 (Wed, 30 May 2007) | 2 lines
  Remove the mimify module.
................
  r55707 | guido.van.rossum | 2007-05-31 05:08:45 -0700 (Thu, 31 May 2007) | 2 lines
  Backport the addition of show_code() to dis.py -- it's too handy.
................
  r55708 | guido.van.rossum | 2007-05-31 06:22:57 -0700 (Thu, 31 May 2007) | 7 lines
  Fix a fairly long-standing bug in the check for assignment to None (and other
  keywords, these days).  In 2.5, you could write foo(None=1) without getting
  a SyntaxError (although foo()'s definition would have to use **kwds to avoid
  getting a runtime error complaining about an unknown keyword of course).
  This ought to be backported to 2.5.2 or at least 2.6.
................
  r55724 | brett.cannon | 2007-05-31 19:32:41 -0700 (Thu, 31 May 2007) | 2 lines
  Remove the cfmfile.
................
  r55727 | neal.norwitz | 2007-05-31 22:19:44 -0700 (Thu, 31 May 2007) | 1 line
  Remove reload() builtin.
................
  r55729 | neal.norwitz | 2007-05-31 22:51:30 -0700 (Thu, 31 May 2007) | 59 lines
  Merged revisions 55636-55728 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r55637 | georg.brandl | 2007-05-29 00:16:47 -0700 (Tue, 29 May 2007) | 2 lines
    Fix rst markup.
  ........
    r55638 | neal.norwitz | 2007-05-29 00:51:39 -0700 (Tue, 29 May 2007) | 1 line
    Fix typo in doc
  ........
    r55671 | neal.norwitz | 2007-05-29 21:53:41 -0700 (Tue, 29 May 2007) | 1 line
    Fix indentation (whitespace only).
  ........
    r55676 | thomas.heller | 2007-05-29 23:58:30 -0700 (Tue, 29 May 2007) | 1 line
    Fix compiler warnings.
  ........
    r55677 | thomas.heller | 2007-05-30 00:01:25 -0700 (Wed, 30 May 2007) | 2 lines
    Correct the name of a field in the WIN32_FIND_DATAA and WIN32_FIND_DATAW structures.
    Closes bug #1726026.
  ........
    r55686 | brett.cannon | 2007-05-30 13:46:26 -0700 (Wed, 30 May 2007) | 2 lines
    Have MimeWriter raise a DeprecationWarning as per PEP 4 and its documentation.
  ........
    r55690 | brett.cannon | 2007-05-30 14:48:58 -0700 (Wed, 30 May 2007) | 3 lines
    Have mimify raise a DeprecationWarning.  The docs and PEP 4 have listed the
    module as deprecated for a while.
  ........
    r55696 | brett.cannon | 2007-05-30 15:24:28 -0700 (Wed, 30 May 2007) | 2 lines
    Have md5 raise a DeprecationWarning as per PEP 4.
  ........
    r55705 | neal.norwitz | 2007-05-30 21:14:22 -0700 (Wed, 30 May 2007) | 1 line
    Add some spaces in the example code.
  ........
    r55716 | brett.cannon | 2007-05-31 12:20:00 -0700 (Thu, 31 May 2007) | 2 lines
    Have the sha module raise a DeprecationWarning as specified in PEP 4.
  ........
    r55719 | brett.cannon | 2007-05-31 12:40:42 -0700 (Thu, 31 May 2007) | 2 lines
    Cause buildtools to raise a DeprecationWarning.
  ........
    r55721 | brett.cannon | 2007-05-31 13:01:11 -0700 (Thu, 31 May 2007) | 2 lines
    Have cfmfile raise a DeprecationWarning as per PEP 4.
  ........
    r55726 | neal.norwitz | 2007-05-31 21:56:47 -0700 (Thu, 31 May 2007) | 1 line
    Mail if there is an installation failure.
  ........
................
  r55730 | neal.norwitz | 2007-05-31 23:22:07 -0700 (Thu, 31 May 2007) | 2 lines
  Remove the code that was missed in rev 55303.
................
  r55738 | neal.norwitz | 2007-06-01 19:10:43 -0700 (Fri, 01 Jun 2007) | 1 line
  Fix doc breakage
................
  r55741 | neal.norwitz | 2007-06-02 00:41:58 -0700 (Sat, 02 Jun 2007) | 1 line
  Remove timing module (plus some remnants of other modules).
................
  r55742 | neal.norwitz | 2007-06-02 00:51:44 -0700 (Sat, 02 Jun 2007) | 1 line
  Remove posixfile module (plus some remnants of other modules).
................
  r55744 | neal.norwitz | 2007-06-02 10:18:56 -0700 (Sat, 02 Jun 2007) | 1 line
  Fix doc breakage.
................
  r55745 | neal.norwitz | 2007-06-02 11:32:16 -0700 (Sat, 02 Jun 2007) | 1 line
  Make a whatsnew 3.0 template.
................
  r55754 | neal.norwitz | 2007-06-03 23:24:18 -0700 (Sun, 03 Jun 2007) | 1 line
  SF #1730441, os._execvpe raises UnboundLocal due to new try/except semantics
................
  r55755 | neal.norwitz | 2007-06-03 23:26:00 -0700 (Sun, 03 Jun 2007) | 1 line
  Get rid of extra whitespace
................
  r55794 | guido.van.rossum | 2007-06-06 15:29:22 -0700 (Wed, 06 Jun 2007) | 3 lines
  Make this compile in GCC 2.96, which does not allow interspersing
  declarations and code.
................
		
	
			
		
			
				
	
	
		
			255 lines
		
	
	
	
		
			7.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			255 lines
		
	
	
	
		
			7.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| 
 | |
| /* Support for dynamic loading of extension modules */
 | |
| 
 | |
| #ifdef HAVE_DIRECT_H
 | |
| #include <direct.h>
 | |
| #endif
 | |
| #include <ctype.h>
 | |
| 
 | |
| #include "Python.h"
 | |
| #include "importdl.h"
 | |
| #include <windows.h>
 | |
| 
 | |
| const struct filedescr _PyImport_DynLoadFiletab[] = {
 | |
| #ifdef _DEBUG
 | |
| 	{"_d.pyd", "rb", C_EXTENSION},
 | |
| #else
 | |
| 	{".pyd", "rb", C_EXTENSION},
 | |
| #endif
 | |
| 	{0, 0}
 | |
| };
 | |
| 
 | |
| 
 | |
| /* Case insensitive string compare, to avoid any dependencies on particular
 | |
|    C RTL implementations */
 | |
| 
 | |
| static int strcasecmp (char *string1, char *string2)
 | |
| { 
 | |
| 	int first, second;
 | |
| 
 | |
| 	do {
 | |
| 		first  = tolower(*string1);
 | |
| 		second = tolower(*string2);
 | |
| 		string1++;
 | |
| 		string2++;
 | |
| 	} while (first && first == second);
 | |
| 
 | |
| 	return (first - second);
 | |
| } 
 | |
| 
 | |
| 
 | |
| /* Function to return the name of the "python" DLL that the supplied module
 | |
|    directly imports.  Looks through the list of imported modules and
 | |
|    returns the first entry that starts with "python" (case sensitive) and
 | |
|    is followed by nothing but numbers until the separator (period).
 | |
| 
 | |
|    Returns a pointer to the import name, or NULL if no matching name was
 | |
|    located.
 | |
| 
 | |
|    This function parses through the PE header for the module as loaded in
 | |
|    memory by the system loader.  The PE header is accessed as documented by
 | |
|    Microsoft in the MSDN PE and COFF specification (2/99), and handles
 | |
|    both PE32 and PE32+.  It only worries about the direct import table and
 | |
|    not the delay load import table since it's unlikely an extension is
 | |
|    going to be delay loading Python (after all, it's already loaded).
 | |
| 
 | |
|    If any magic values are not found (e.g., the PE header or optional
 | |
|    header magic), then this function simply returns NULL. */
 | |
| 
 | |
| #define DWORD_AT(mem) (*(DWORD *)(mem))
 | |
| #define WORD_AT(mem)  (*(WORD *)(mem))
 | |
| 
 | |
| static char *GetPythonImport (HINSTANCE hModule)
 | |
| {
 | |
| 	unsigned char *dllbase, *import_data, *import_name;
 | |
| 	DWORD pe_offset, opt_offset;
 | |
| 	WORD opt_magic;
 | |
| 	int num_dict_off, import_off;
 | |
| 
 | |
| 	/* Safety check input */
 | |
| 	if (hModule == NULL) {
 | |
| 		return NULL;
 | |
| 	}
 | |
| 
 | |
| 	/* Module instance is also the base load address.  First portion of
 | |
| 	   memory is the MS-DOS loader, which holds the offset to the PE
 | |
| 	   header (from the load base) at 0x3C */
 | |
| 	dllbase = (unsigned char *)hModule;
 | |
| 	pe_offset = DWORD_AT(dllbase + 0x3C);
 | |
| 
 | |
| 	/* The PE signature must be "PE\0\0" */
 | |
| 	if (memcmp(dllbase+pe_offset,"PE\0\0",4)) {
 | |
| 		return NULL;
 | |
| 	}
 | |
| 
 | |
| 	/* Following the PE signature is the standard COFF header (20
 | |
| 	   bytes) and then the optional header.  The optional header starts
 | |
| 	   with a magic value of 0x10B for PE32 or 0x20B for PE32+ (PE32+
 | |
| 	   uses 64-bits for some fields).  It might also be 0x107 for a ROM
 | |
| 	   image, but we don't process that here.
 | |
| 
 | |
| 	   The optional header ends with a data dictionary that directly
 | |
| 	   points to certain types of data, among them the import entries
 | |
| 	   (in the second table entry). Based on the header type, we
 | |
| 	   determine offsets for the data dictionary count and the entry
 | |
| 	   within the dictionary pointing to the imports. */
 | |
| 
 | |
| 	opt_offset = pe_offset + 4 + 20;
 | |
| 	opt_magic = WORD_AT(dllbase+opt_offset);
 | |
| 	if (opt_magic == 0x10B) {
 | |
| 		/* PE32 */
 | |
| 		num_dict_off = 92;
 | |
| 		import_off   = 104;
 | |
| 	} else if (opt_magic == 0x20B) {
 | |
| 		/* PE32+ */
 | |
| 		num_dict_off = 108;
 | |
| 		import_off   = 120;
 | |
| 	} else {
 | |
| 		/* Unsupported */
 | |
| 		return NULL;
 | |
| 	}
 | |
| 
 | |
| 	/* Now if an import table exists, offset to it and walk the list of
 | |
| 	   imports.  The import table is an array (ending when an entry has
 | |
| 	   empty values) of structures (20 bytes each), which contains (at
 | |
| 	   offset 12) a relative address (to the module base) at which a
 | |
| 	   string constant holding the import name is located. */
 | |
| 
 | |
| 	if (DWORD_AT(dllbase + opt_offset + num_dict_off) >= 2) {
 | |
| 		/* We have at least 2 tables - the import table is the second
 | |
| 		   one.  But still it may be that the table size is zero */
 | |
| 		if (0 == DWORD_AT(dllbase + opt_offset + import_off + sizeof(DWORD)))
 | |
| 			return NULL;
 | |
| 		import_data = dllbase + DWORD_AT(dllbase +
 | |
| 						 opt_offset +
 | |
| 						 import_off);
 | |
| 		while (DWORD_AT(import_data)) {
 | |
| 			import_name = dllbase + DWORD_AT(import_data+12);
 | |
| 			if (strlen(import_name) >= 6 &&
 | |
| 			    !strncmp(import_name,"python",6)) {
 | |
| 				char *pch;
 | |
| 
 | |
| 				/* Ensure python prefix is followed only
 | |
| 				   by numbers to the end of the basename */
 | |
| 				pch = import_name + 6;
 | |
| #ifdef _DEBUG
 | |
| 				while (*pch && pch[0] != '_' && pch[1] != 'd' && pch[2] != '.') {
 | |
| #else
 | |
| 				while (*pch && *pch != '.') {
 | |
| #endif
 | |
| 					if (*pch >= '0' && *pch <= '9') {
 | |
| 						pch++;
 | |
| 					} else {
 | |
| 						pch = NULL;
 | |
| 						break;
 | |
| 					}
 | |
| 				}
 | |
| 	    
 | |
| 				if (pch) {
 | |
| 					/* Found it - return the name */
 | |
| 					return import_name;
 | |
| 				}
 | |
| 			}
 | |
| 			import_data += 20;
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return NULL;
 | |
| }
 | |
| 
 | |
| 
 | |
| dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
 | |
| 				    const char *pathname, FILE *fp)
 | |
| {
 | |
| 	dl_funcptr p;
 | |
| 	char funcname[258], *import_python;
 | |
| 
 | |
| 	PyOS_snprintf(funcname, sizeof(funcname), "init%.200s", shortname);
 | |
| 
 | |
| 	{
 | |
| 		HINSTANCE hDLL = NULL;
 | |
| 		char pathbuf[260];
 | |
| 		LPTSTR dummy;
 | |
| 		/* We use LoadLibraryEx so Windows looks for dependent DLLs 
 | |
| 		    in directory of pathname first.  However, Windows95
 | |
| 		    can sometimes not work correctly unless the absolute
 | |
| 		    path is used.  If GetFullPathName() fails, the LoadLibrary
 | |
| 		    will certainly fail too, so use its error code */
 | |
| 		if (GetFullPathName(pathname,
 | |
| 				    sizeof(pathbuf),
 | |
| 				    pathbuf,
 | |
| 				    &dummy))
 | |
| 			/* XXX This call doesn't exist in Windows CE */
 | |
| 			hDLL = LoadLibraryEx(pathname, NULL,
 | |
| 					     LOAD_WITH_ALTERED_SEARCH_PATH);
 | |
| 		if (hDLL==NULL){
 | |
| 			char errBuf[256];
 | |
| 			unsigned int errorCode;
 | |
| 
 | |
| 			/* Get an error string from Win32 error code */
 | |
| 			char theInfo[256]; /* Pointer to error text
 | |
| 					      from system */
 | |
| 			int theLength; /* Length of error text */
 | |
| 
 | |
| 			errorCode = GetLastError();
 | |
| 
 | |
| 			theLength = FormatMessage(
 | |
| 				FORMAT_MESSAGE_FROM_SYSTEM, /* flags */
 | |
| 				NULL, /* message source */
 | |
| 				errorCode, /* the message (error) ID */
 | |
| 				0, /* default language environment */
 | |
| 				(LPTSTR) theInfo, /* the buffer */
 | |
| 				sizeof(theInfo), /* the buffer size */
 | |
| 				NULL); /* no additional format args. */
 | |
| 
 | |
| 			/* Problem: could not get the error message.
 | |
| 			   This should not happen if called correctly. */
 | |
| 			if (theLength == 0) {
 | |
| 				PyOS_snprintf(errBuf, sizeof(errBuf),
 | |
| 				      "DLL load failed with error code %d",
 | |
| 					      errorCode);
 | |
| 			} else {
 | |
| 				size_t len;
 | |
| 				/* For some reason a \r\n
 | |
| 				   is appended to the text */
 | |
| 				if (theLength >= 2 &&
 | |
| 				    theInfo[theLength-2] == '\r' &&
 | |
| 				    theInfo[theLength-1] == '\n') {
 | |
| 					theLength -= 2;
 | |
| 					theInfo[theLength] = '\0';
 | |
| 				}
 | |
| 				strcpy(errBuf, "DLL load failed: ");
 | |
| 				len = strlen(errBuf);
 | |
| 				strncpy(errBuf+len, theInfo,
 | |
| 					sizeof(errBuf)-len);
 | |
| 				errBuf[sizeof(errBuf)-1] = '\0';
 | |
| 			}
 | |
| 			PyErr_SetString(PyExc_ImportError, errBuf);
 | |
| 			return NULL;
 | |
| 		} else {
 | |
| 			char buffer[256];
 | |
| 
 | |
| #ifdef _DEBUG
 | |
| 			PyOS_snprintf(buffer, sizeof(buffer), "python%d%d_d.dll",
 | |
| #else
 | |
| 			PyOS_snprintf(buffer, sizeof(buffer), "python%d%d.dll",
 | |
| #endif
 | |
| 				      PY_MAJOR_VERSION,PY_MINOR_VERSION);
 | |
| 			import_python = GetPythonImport(hDLL);
 | |
| 
 | |
| 			if (import_python &&
 | |
| 			    strcasecmp(buffer,import_python)) {
 | |
| 				PyOS_snprintf(buffer, sizeof(buffer),
 | |
| 					      "Module use of %.150s conflicts "
 | |
| 					      "with this version of Python.",
 | |
| 					      import_python);
 | |
| 				PyErr_SetString(PyExc_ImportError,buffer);
 | |
| 				FreeLibrary(hDLL);
 | |
| 				return NULL;
 | |
| 			}
 | |
| 		}
 | |
| 		p = GetProcAddress(hDLL, funcname);
 | |
| 	}
 | |
| 
 | |
| 	return p;
 | |
| }
 |