cpython-lru_cache-weakref: Python/dynload

annotate Python/dynload_next.c @ 45852:30c4e1ca8421

Merged revisions 61431,61433-61436,61439,61444,61449-61450,61453,61458,61465,61468,61471-61474,61480,61483-61484,61488,61495-61496,61498,61503-61504,61507,61509-61510,61515-61518 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r61431 | vinay.sajip | 2008-03-16 22:35:58 +0100 (So, 16 Mär 2008) | 1 line Clarified documentation on use of shutdown(). ........ r61433 | mark.summerfield | 2008-03-17 09:28:15 +0100 (Mo, 17 Mär 2008) | 5 lines Added a footnote to each pointing out that for XML output if an encoding string is given it should conform to the appropriate XML standards---for example, "UTF-8" is okay, but "UTF8" is not. ........ r61434 | eric.smith | 2008-03-17 12:01:01 +0100 (Mo, 17 Mär 2008) | 7 lines Issue 2264: empty float presentation type needs to have at least one digit past the decimal point. Added "Z" format_char to PyOS_ascii_formatd to support empty float presentation type. Renamed buf_size in PyOS_ascii_formatd to more accurately reflect it's meaning. Modified format.__float__ to use the new "Z" format as the default. Added test cases. ........ r61435 | eric.smith | 2008-03-17 13:14:29 +0100 (Mo, 17 Mär 2008) | 2 lines Reformated lines > 79 chars. Deleted unused macro ISXDIGIT. ........ r61436 | jeffrey.yasskin | 2008-03-17 15:40:53 +0100 (Mo, 17 Mär 2008) | 13 lines Allow Gnu gcc's to build python on OSX by removing -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd from configure. * r22183 added -no-cpp-precomp, which http://gcc.gnu.org/ml/gcc/2005-12/msg00368.html claims hasn't been needed since gcc-3.1. * r25607 added -Wno-long-double to avoid a warning in Include/objimpl.h (issue 525481). The long double is still there, but OSX 10.4's gcc no longer warns about it. * r33666 fixed issue 775892 on OSX 10.3 by adding -mno-fused-madd, which changed the sign of some float 0s. Tim Peters said it wasn't a real issue anyway, and it no longer causes test failures. Fixes issue #1779871. ........ r61439 | martin.v.loewis | 2008-03-17 17:31:57 +0100 (Mo, 17 Mär 2008) | 2 lines Add Trent Nelson. ........ r61444 | travis.oliphant | 2008-03-17 18:36:12 +0100 (Mo, 17 Mär 2008) | 1 line Add necessary headers to back-port new buffer protocol to Python 2.6 ........ r61449 | gregory.p.smith | 2008-03-17 19:48:05 +0100 (Mo, 17 Mär 2008) | 8 lines Force zlib.crc32 and zlib.adler32 to return a signed integer on all platforms regardless of the native sizeof(long) used in the integer object. This somewhat odd behavior of returning a signed is maintained in 2.x for compatibility reasons of always returning an integer rather than a long object. Fixes Issue1202 for Python 2.6 ........ r61450 | neal.norwitz | 2008-03-17 20:02:45 +0100 (Mo, 17 Mär 2008) | 3 lines Use a buffer large enough to ensure we don't overrun, even if the value is outside the range we expect. ........ r61453 | steven.bethard | 2008-03-17 20:33:11 +0100 (Mo, 17 Mär 2008) | 1 line Document unicode.isnumeric() and unicode.isdecimal() (issue2326) ........ r61458 | neal.norwitz | 2008-03-17 21:22:43 +0100 (Mo, 17 Mär 2008) | 5 lines Issue 2321: reduce memory usage (increase the memory that is returned to the system) by using pymalloc for the data of unicode objects. Will backport. ........ r61465 | martin.v.loewis | 2008-03-17 22:55:30 +0100 (Mo, 17 Mär 2008) | 2 lines Add David Wolever. ........ r61468 | gregory.p.smith | 2008-03-18 01:20:01 +0100 (Di, 18 Mär 2008) | 3 lines Fix the IOError message text when opening a file with an invalid filename. Error reported by Ilan Schnell. ........ r61471 | brett.cannon | 2008-03-18 02:00:07 +0100 (Di, 18 Mär 2008) | 2 lines Convert test_strftime, test_getargs, and test_pep247 to use unittest. ........ r61472 | jeffrey.yasskin | 2008-03-18 02:09:59 +0100 (Di, 18 Mär 2008) | 2 lines Fix build on platforms that don't have intptr_t. Patch by Joseph Armbruster. ........ r61473 | brett.cannon | 2008-03-18 02:50:25 +0100 (Di, 18 Mär 2008) | 2 lines Convert test_dummy_threading and test_dbm to unittest. ........ r61474 | brett.cannon | 2008-03-18 02:58:56 +0100 (Di, 18 Mär 2008) | 2 lines Move test_extcall to doctest. ........ r61480 | brett.cannon | 2008-03-18 04:46:22 +0100 (Di, 18 Mär 2008) | 2 lines test_errno was a no-op test; now it actually tests things and uses unittest. ........ r61483 | brett.cannon | 2008-03-18 05:09:00 +0100 (Di, 18 Mär 2008) | 3 lines Remove our implementation of memmove() and strerror(); both are in the C89 standard library. ........ r61484 | brett.cannon | 2008-03-18 05:16:06 +0100 (Di, 18 Mär 2008) | 2 lines The output directory for tests that compare against stdout is now gone! ........ r61488 | jeffrey.yasskin | 2008-03-18 05:29:35 +0100 (Di, 18 Mär 2008) | 2 lines Block the "socket.ssl() is deprecated" warning from test_socket_ssl. ........ r61495 | jeffrey.yasskin | 2008-03-18 05:56:06 +0100 (Di, 18 Mär 2008) | 4 lines Speed test_thread up from 51.328s to 0.081s by reducing its sleep times. We still sleep at all to make it likely that all threads are active at the same time. ........ r61496 | jeffrey.yasskin | 2008-03-18 06:12:41 +0100 (Di, 18 Mär 2008) | 4 lines Speed up test_dict by about 10x by only checking selected dict literal sizes, instead of every integer from 0 to 400. Exhaustive testing wastes time without providing enough more assurance that the code is correct. ........ r61498 | neal.norwitz | 2008-03-18 06:20:29 +0100 (Di, 18 Mär 2008) | 1 line Try increasing the timeout to reduce the flakiness of this test. ........ r61503 | brett.cannon | 2008-03-18 06:43:04 +0100 (Di, 18 Mär 2008) | 2 lines Improve the error message for a test that failed on the S-390 Debian buildbot. ........ r61504 | jeffrey.yasskin | 2008-03-18 06:45:40 +0100 (Di, 18 Mär 2008) | 3 lines Add a -S/--slow flag to regrtest to have it print the 10 slowest tests with their times. ........ r61507 | neal.norwitz | 2008-03-18 07:03:46 +0100 (Di, 18 Mär 2008) | 1 line Add some info to the failure messages ........ r61509 | trent.nelson | 2008-03-18 08:02:12 +0100 (Di, 18 Mär 2008) | 1 line Issue 2286: bump up the stack size of the 64-bit debug python_d.exe to 2100000. The default value of 200000 causes a stack overflow at 1965 iterations of r_object() in marshal.c, 35 iterations before the 2000 limit enforced by MAX_MARSHAL_STACK_DEPTH. ........ r61510 | trent.nelson | 2008-03-18 08:32:47 +0100 (Di, 18 Mär 2008) | 5 lines The behaviour of winsound.Beep() seems to differ between different versions of Windows when there's either: a) no sound card entirely b) legacy beep driver has been disabled c) the legacy beep driver has been uninstalled Sometimes RuntimeErrors are raised, sometimes they're not. If _have_soundcard() returns False, don't expect winsound.Beep() to raise a RuntimeError, as this clearly isn't the case, as demonstrated by the various Win32 XP buildbots. ........ r61515 | martin.v.loewis | 2008-03-18 13:20:15 +0100 (Di, 18 Mär 2008) | 2 lines norwitz-amd64 (gentoo) has EREMOTEIO. ........ r61516 | martin.v.loewis | 2008-03-18 13:45:37 +0100 (Di, 18 Mär 2008) | 2 lines Add more Linux error codes. ........ r61517 | martin.v.loewis | 2008-03-18 14:05:03 +0100 (Di, 18 Mär 2008) | 2 lines Add WSA errors. ........ r61518 | martin.v.loewis | 2008-03-18 14:16:05 +0100 (Di, 18 Mär 2008) | 2 lines Note that the stderr output of the test is intentional. ........

author	Christian Heimes <christian@cheimes.de>
date	Tue, 18 Mar 2008 15:15:01 +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 @ 45852:30c4e1ca8421