cpython-lru_cache-weakref: Python/dynload

annotate Python/dynload_next.c @ 42309:bd6acfdb47d2

Merged revisions 56301-56442 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56322 | kurt.kaiser | 2007-07-12 11:35:03 -0700 (Thu, 12 Jul 2007) | 2 lines Replace obscure code which was failing in py3k. ................ r56323 | kurt.kaiser | 2007-07-12 11:44:12 -0700 (Thu, 12 Jul 2007) | 3 lines 1. Remove new division option 2. Update IDLE version to 3.0x ................ r56327 | kurt.kaiser | 2007-07-12 12:20:20 -0700 (Thu, 12 Jul 2007) | 5 lines Fix another instance of this defect in Tkinter, and one in IDLE. Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size change during iter in destroy call. ................ r56339 | georg.brandl | 2007-07-13 03:07:25 -0700 (Fri, 13 Jul 2007) | 2 lines Fix #1753310: regrtest -x doesn't work anymore ................ r56361 | kurt.kaiser | 2007-07-13 18:25:24 -0700 (Fri, 13 Jul 2007) | 2 lines convert a map() iterator to a list to get this working. ................ r56362 | kurt.kaiser | 2007-07-13 18:53:45 -0700 (Fri, 13 Jul 2007) | 2 lines Was modifying dict during iteration. ................ r56376 | collin.winter | 2007-07-14 11:56:19 -0700 (Sat, 14 Jul 2007) | 1 line Add an example of class decorators to test_grammar. ................ r56377 | collin.winter | 2007-07-14 12:00:17 -0700 (Sat, 14 Jul 2007) | 1 line Add a basic example of dictcomps to test_grammar. ................ r56413 | neal.norwitz | 2007-07-17 00:21:18 -0700 (Tue, 17 Jul 2007) | 149 lines Merged revisions 56202-56412 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56204 | ronald.oussoren | 2007-07-08 23:02:21 -0700 (Sun, 08 Jul 2007) | 2 lines Patch 1693258: Fix for duplicate "preferences" menu-OS X ........ r56207 | ronald.oussoren | 2007-07-09 01:41:15 -0700 (Mon, 09 Jul 2007) | 4 lines Patch 1673122: be explicit about which libtool to use, to avoid name clashes when a users install GNU libtool early in his PATH ........ r56280 | georg.brandl | 2007-07-11 12:41:49 -0700 (Wed, 11 Jul 2007) | 2 lines Fix #1752132: wrong comment in opcode description. ........ r56293 | georg.brandl | 2007-07-12 01:05:45 -0700 (Thu, 12 Jul 2007) | 3 lines Patch #1752270, #1750931: complain if urllib2 add_handler called without handler. ........ r56296 | georg.brandl | 2007-07-12 01:11:29 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1739696: use code.co_code only if really necessary ........ r56298 | georg.brandl | 2007-07-12 01:38:00 -0700 (Thu, 12 Jul 2007) | 3 lines Patch #1673759: add a missing overflow check when formatting floats with %G. ........ r56302 | georg.brandl | 2007-07-12 02:06:41 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1731659: improve time.strptime docs. ........ r56304 | georg.brandl | 2007-07-12 02:24:04 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1731169: clean up expected skips list. ........ r56306 | georg.brandl | 2007-07-12 02:37:49 -0700 (Thu, 12 Jul 2007) | 3 lines Bug #1637365: add subsection about "__name__ == __main__" to the Python tutorial. ........ r56308 | georg.brandl | 2007-07-12 02:59:22 -0700 (Thu, 12 Jul 2007) | 5 lines Patch #1675424: Added tests for uncovered code in the zipfile module. The KeyError raised by Zipfile.getinfo for nonexistent names now has a descriptive message. ........ r56340 | facundo.batista | 2007-07-13 03:43:44 -0700 (Fri, 13 Jul 2007) | 6 lines Added tests for basic behavior of DateTime, Binary, and Fault classes and the escape function. Check that marshalling recursive sequences & dicts raises TypeError. Check that marshalling out-of-range ints raises OverflowError [Alan McIntyre - GSoC] ........ r56345 | raymond.hettinger | 2007-07-13 05:09:41 -0700 (Fri, 13 Jul 2007) | 1 line Correct the docs for takewhile(). Improve the recipe for nth(). Should be backported ........ r56348 | thomas.heller | 2007-07-13 06:59:39 -0700 (Fri, 13 Jul 2007) | 4 lines Repair COMError. Since exceptions are new style classes now, setting the methods and docstring after the type creation does not work, they must be in the dictionary before creating the type. ........ r56349 | thomas.heller | 2007-07-13 07:18:06 -0700 (Fri, 13 Jul 2007) | 1 line Add tests for _ctypes.COMError. ........ r56350 | thomas.heller | 2007-07-13 09:50:43 -0700 (Fri, 13 Jul 2007) | 4 lines Do not try to load the GLUT library in the ctypes tests. This test adds little value, but has a large problem on OS X, as explained in SF# 1581906. ........ r56352 | thomas.heller | 2007-07-13 10:12:23 -0700 (Fri, 13 Jul 2007) | 3 lines Fix for SF# 1701409: segfault in c_char_p of ctypes. The repr output of c_char_p and c_wchar_p has changed as a sideeffect. ........ r56355 | thomas.heller | 2007-07-13 10:46:54 -0700 (Fri, 13 Jul 2007) | 3 lines Fix for SF# 1649098: avoid zero-sized array declaration in structure. ........ r56357 | thomas.heller | 2007-07-13 12:51:55 -0700 (Fri, 13 Jul 2007) | 3 lines PyType_stgdict() returns a borrowed reference which must not be Py_DECREF'd. ........ r56360 | barry.warsaw | 2007-07-13 15:12:58 -0700 (Fri, 13 Jul 2007) | 10 lines In response to this SF bug: [ 1752723 ] email.message_from_string: initial line gets discarded I added a test to assert that when the first line of text passed to message_from_string() contains a leading space, the message ends up with the appropriate FirstHeaderLineIsContinuationDefect on its defects list. The bug is invalid. ........ r56364 | georg.brandl | 2007-07-14 10:12:23 -0700 (Sat, 14 Jul 2007) | 2 lines Bug #1753406: missing \versionadded for subprocess.check_call. ........ r56366 | georg.brandl | 2007-07-14 10:32:41 -0700 (Sat, 14 Jul 2007) | 2 lines Clarify webbrowser.open description. ........ r56380 | andrew.kuchling | 2007-07-14 13:58:21 -0700 (Sat, 14 Jul 2007) | 1 line Typo fix ........ r56382 | andrew.kuchling | 2007-07-14 14:56:19 -0700 (Sat, 14 Jul 2007) | 7 lines Avoid exception if there's a stray directory inside a Maildir folder. The Maildir specification doesn't seem to say anything about this situation, and it can happen if you're keeping a Maildir mailbox in Subversion (.svn directories) or some similar system. The patch just ignores directories in the cur/, new/, tmp/ folders. ........ r56392 | facundo.batista | 2007-07-14 15:41:45 -0700 (Sat, 14 Jul 2007) | 6 lines First version. Includes tests for helper functions: read, write, _exception, readwrite, closeall, compact_traceback; and for classes dispatcher, dispatcher_with_send, and file_wrapper. [Alan McIntyre - GSoC] ........ r56399 | facundo.batista | 2007-07-15 13:30:39 -0700 (Sun, 15 Jul 2007) | 5 lines Changed the used port and commented out some tests that uses a non documented function that appers to uses resources not present in Windows. ........ r56412 | facundo.batista | 2007-07-16 19:19:39 -0700 (Mon, 16 Jul 2007) | 6 lines Prevent asyncore.dispatcher tests from hanging by adding loop counters to server & client, and by adding asyncore.close_all calls in tearDown. Also choose correct expected logging results based on the value of __debug__ [Alan McIntyre - GSoC] ........ ................ r56442 | guido.van.rossum | 2007-07-18 10:26:38 -0700 (Wed, 18 Jul 2007) | 14 lines Merged revisions 56413-56441 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56439 | georg.brandl | 2007-07-17 23:37:55 -0700 (Tue, 17 Jul 2007) | 2 lines Use "Unix" as platform name, not "UNIX". ........ r56441 | guido.van.rossum | 2007-07-18 10:19:14 -0700 (Wed, 18 Jul 2007) | 3 lines SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. (Slightly tweaked for style and refcounts.) ........ ................

author	Guido van Rossum <guido@python.org>
date	Wed, 18 Jul 2007 18:15:48 +0000
parents	f08529879db1
children	fd25030223b0 94f64f11fdd0

rev	line source
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	1
21860 20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	2 /* Support for dynamic loading of extension modules on Mac OS X
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	3 ** All references to "NeXT" are for historical reasons.
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	4 */
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	5
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	6 #include "Python.h"
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	7 #include "importdl.h"
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	8
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	9 #include <mach-o/dyld.h>
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	10
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	11 const struct filedescr _PyImport_DynLoadFiletab[] = {
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	12 {".so", "rb", C_EXTENSION},
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	13 {"module.so", "rb", C_EXTENSION},
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	14 {0, 0}
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	15 };
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	16
21860 20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	17 /*
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	18 ** Python modules are Mach-O MH_BUNDLE files. The best way to load these
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	19 ** is each in a private namespace, so you can load, say, a module bar and a
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	20 ** module foo.bar. If we load everything in the global namespace the two
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	21 ** initbar() symbols will conflict.
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	22 ** However, it seems some extension packages depend upon being able to access
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	23 ** each others' global symbols. There seems to be no way to eat our cake and
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	24 ** have it, so the USE_DYLD_GLOBAL_NAMESPACE define determines which behaviour
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	25 ** you get.
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	26 */
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	27
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	28 #ifdef USE_DYLD_GLOBAL_NAMESPACE
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	29 #define LINKOPTIONS NSLINKMODULE_OPTION_BINDNOW\|NSLINKMODULE_OPTION_RETURN_ON_ERROR
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	30 #else
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	31 #define LINKOPTIONS NSLINKMODULE_OPTION_BINDNOW\| \
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	32 NSLINKMODULE_OPTION_RETURN_ON_ERROR\|NSLINKMODULE_OPTION_PRIVATE
20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	33 #endif
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11599 diff changeset	34 dl_funcptr _PyImport_GetDynLoadFunc(const char fqname, const char shortname,
21860 20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	35 const char pathname, FILE fp)
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	36 {
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	37 dl_funcptr p = NULL;
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11599 diff changeset	38 char funcname[258];
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	39 NSObjectFileImageReturnCode rc;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	40 NSObjectFileImage image;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	41 NSModule newModule;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	42 NSSymbol theSym;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	43 const char *errString;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	44 char errBuf[512];
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11599 diff changeset	45
21077 379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19178 diff changeset	46 PyOS_snprintf(funcname, sizeof(funcname), "_init%.200s", shortname);
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	47
21860 20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	48 #ifdef USE_DYLD_GLOBAL_NAMESPACE
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	49 if (NSIsSymbolNameDefined(funcname)) {
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	50 theSym = NSLookupAndBindSymbol(funcname);
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	51 p = (dl_funcptr)NSAddressOfSymbol(theSym);
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	52 return p;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	53 }
21860 20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	54 #endif
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	55 rc = NSCreateObjectFileImageFromFile(pathname, &image);
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	56 switch(rc) {
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	57 default:
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	58 case NSObjectFileImageFailure:
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	59 case NSObjectFileImageFormat:
21860 20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	60 /* for these a message is printed on stderr by dyld */
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	61 errString = "Can't create object file image";
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	62 break;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	63 case NSObjectFileImageSuccess:
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	64 errString = NULL;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	65 break;
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	66 case NSObjectFileImageInappropriateFile:
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	67 errString = "Inappropriate file type for dynamic loading";
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	68 break;
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	69 case NSObjectFileImageArch:
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	70 errString = "Wrong CPU type in object file";
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	71 break;
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	72 case NSObjectFileImageAccess:
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	73 errString = "Can't read object file (no access)";
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	74 break;
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	75 }
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	76 if (errString == NULL) {
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	77 newModule = NSLinkModule(image, pathname, LINKOPTIONS);
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	78 if (newModule == NULL) {
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	79 int errNo;
26764 6b31b26e418d Squashed compiler warnings by adding casts, making sure prototypes are in Jack Jansen <jack.jansen@cwi.nl> parents: 21911 diff changeset	80 const char fileName, moreErrorStr;
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	81 NSLinkEditErrors c;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	82 NSLinkEditError( &c, &errNo, &fileName, &moreErrorStr );
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	83 PyOS_snprintf(errBuf, 512, "Failure linking new module: %s: %s",
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	84 fileName, moreErrorStr);
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	85 errString = errBuf;
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	86 }
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	87 }
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	88 if (errString != NULL) {
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	89 PyErr_SetString(PyExc_ImportError, errString);
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	90 return NULL;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	91 }
21860 20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	92 #ifdef USE_DYLD_GLOBAL_NAMESPACE
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	93 if (!NSIsSymbolNameDefined(funcname)) {
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	94 /* UnlinkModule() isn't implemented in current versions, but calling it does no harm */
32707 f08529879db1 Fix for 838140: don't call NSUnlinkModule when we fail to find our Jack Jansen <jack.jansen@cwi.nl> parents: 26764 diff changeset	95 /* NSUnLinkModule(newModule, FALSE); removed: causes problems for ObjC code */
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	96 PyErr_Format(PyExc_ImportError,
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	97 "Loaded module does not contain symbol %.200s",
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	98 funcname);
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	99 return NULL;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	100 }
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	101 theSym = NSLookupAndBindSymbol(funcname);
21860 20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	102 #else
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	103 theSym = NSLookupSymbolInModule(newModule, funcname);
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	104 if ( theSym == NULL ) {
32707 f08529879db1 Fix for 838140: don't call NSUnlinkModule when we fail to find our Jack Jansen <jack.jansen@cwi.nl> parents: 26764 diff changeset	105 /* NSUnLinkModule(newModule, FALSE); removed: causes problems for ObjC code */
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	106 PyErr_Format(PyExc_ImportError,
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	107 "Loaded module does not contain symbol %.200s",
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	108 funcname);
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	109 return NULL;
cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	110 }
21860 20bc4ff1215c A new dynload_next, which actually only works on OSX but isn't renamed yet. Jack Jansen <jack.jansen@cwi.nl> parents: 21276 diff changeset	111 #endif
21863 cbf41925dd3e Got rid of an extra level of {} and funny formatting that was still Jack Jansen <jack.jansen@cwi.nl> parents: 21860 diff changeset	112 p = (dl_funcptr)NSAddressOfSymbol(theSym);
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	113 return p;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	114 }

Mercurial > cpython-lru_cache-weakref

annotate Python/dynload_next.c @ 42309:bd6acfdb47d2