cpython-lru_cache-weakref: Python/dynload

annotate Python/dynload_next.c @ 43292:876b7ef4775d

Merged revisions 57778-58052 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r57820 | georg.brandl | 2007-08-31 08:59:27 +0200 (Fri, 31 Aug 2007) | 2 lines Document new shorthand notation for index entries. ........ r57827 | georg.brandl | 2007-08-31 10:47:51 +0200 (Fri, 31 Aug 2007) | 2 lines Fix subitem markup. ........ r57833 | martin.v.loewis | 2007-08-31 12:01:07 +0200 (Fri, 31 Aug 2007) | 1 line Mark registry components as 64-bit on Win64. ........ r57854 | bill.janssen | 2007-08-31 21:02:23 +0200 (Fri, 31 Aug 2007) | 1 line deprecate use of FakeSocket ........ r57855 | bill.janssen | 2007-08-31 21:02:46 +0200 (Fri, 31 Aug 2007) | 1 line remove mentions of socket.ssl in comments ........ r57856 | bill.janssen | 2007-08-31 21:03:31 +0200 (Fri, 31 Aug 2007) | 1 line remove use of non-existent SSLFakeSocket in apparently untested code ........ r57859 | martin.v.loewis | 2007-09-01 08:36:03 +0200 (Sat, 01 Sep 2007) | 3 lines Bug #1737210: Change Manufacturer of Windows installer to PSF. Will backport to 2.5. ........ r57865 | georg.brandl | 2007-09-01 09:51:24 +0200 (Sat, 01 Sep 2007) | 2 lines Fix RST link (backport from Py3k). ........ r57876 | georg.brandl | 2007-09-01 17:49:49 +0200 (Sat, 01 Sep 2007) | 2 lines Document sets' ">" and "<" operations (backport from py3k). ........ r57878 | skip.montanaro | 2007-09-01 19:40:03 +0200 (Sat, 01 Sep 2007) | 4 lines Added a note and examples to explain that re.split does not split on an empty pattern match. (issue 852532). ........ r57879 | walter.doerwald | 2007-09-01 20:18:09 +0200 (Sat, 01 Sep 2007) | 2 lines Fix wrong function names. ........ r57880 | walter.doerwald | 2007-09-01 20:34:05 +0200 (Sat, 01 Sep 2007) | 2 lines Fix typo. ........ r57889 | andrew.kuchling | 2007-09-01 22:31:59 +0200 (Sat, 01 Sep 2007) | 1 line Markup fix ........ r57892 | andrew.kuchling | 2007-09-01 22:43:36 +0200 (Sat, 01 Sep 2007) | 1 line Add various items ........ r57895 | andrew.kuchling | 2007-09-01 23:17:58 +0200 (Sat, 01 Sep 2007) | 1 line Wording change ........ r57896 | andrew.kuchling | 2007-09-01 23:18:31 +0200 (Sat, 01 Sep 2007) | 1 line Add more items ........ r57904 | ronald.oussoren | 2007-09-02 11:46:07 +0200 (Sun, 02 Sep 2007) | 3 lines Macosx: this patch ensures that the value of MACOSX_DEPLOYMENT_TARGET used by the Makefile is also used at configure-time. ........ r57925 | georg.brandl | 2007-09-03 09:16:46 +0200 (Mon, 03 Sep 2007) | 2 lines Fix #883466: don't allow Unicode as arguments to quopri and uu codecs. ........ r57936 | matthias.klose | 2007-09-04 01:33:04 +0200 (Tue, 04 Sep 2007) | 2 lines - Added support for linking the bsddb module against BerkeleyDB 4.6.x. ........ r57954 | mark.summerfield | 2007-09-04 10:16:15 +0200 (Tue, 04 Sep 2007) | 3 lines Added cross-references plus a note about dict & list shallow copying. ........ r57958 | martin.v.loewis | 2007-09-04 11:51:57 +0200 (Tue, 04 Sep 2007) | 3 lines Document that we rely on the OS to release the crypto context. Fixes #1626801. ........ r57960 | martin.v.loewis | 2007-09-04 15:13:14 +0200 (Tue, 04 Sep 2007) | 3 lines Patch #1388440: Add set_completion_display_matches_hook and get_completion_type to readline. ........ r57961 | martin.v.loewis | 2007-09-04 16:19:28 +0200 (Tue, 04 Sep 2007) | 3 lines Patch #1031213: Decode source line in SyntaxErrors back to its original source encoding. Will backport to 2.5. ........ r57972 | matthias.klose | 2007-09-04 20:17:36 +0200 (Tue, 04 Sep 2007) | 3 lines - Makefile.pre.in(buildbottest): Run an optional script pybuildbot.identify to include some information about the build environment. ........ r57973 | matthias.klose | 2007-09-04 21:05:38 +0200 (Tue, 04 Sep 2007) | 2 lines - Makefile.pre.in(buildbottest): Remove whitespace at eol. ........ r57975 | matthias.klose | 2007-09-04 22:46:02 +0200 (Tue, 04 Sep 2007) | 2 lines - Fix libffi configure for hppa*-*-linux* | parisc*-*-linux*. ........ r57980 | bill.janssen | 2007-09-05 02:46:27 +0200 (Wed, 05 Sep 2007) | 1 line SSL certificate distinguished names should be represented by tuples ........ r57985 | martin.v.loewis | 2007-09-05 08:39:17 +0200 (Wed, 05 Sep 2007) | 3 lines Patch #1105: Explain that one needs to build the solution to get dependencies right. ........ r57987 | armin.rigo | 2007-09-05 09:51:21 +0200 (Wed, 05 Sep 2007) | 4 lines PyDict_GetItem() returns a borrowed reference. There are probably a number of places that are open to attacks such as the following one, in bltinmodule.c:min_max(). ........ r57991 | martin.v.loewis | 2007-09-05 13:47:34 +0200 (Wed, 05 Sep 2007) | 3 lines Patch #786737: Allow building in a tree of symlinks pointing to a readonly source. ........ r57993 | georg.brandl | 2007-09-05 15:36:44 +0200 (Wed, 05 Sep 2007) | 2 lines Backport from Py3k: Bug #1684991: explain lookup semantics for __special__ methods (new-style classes only). ........ r58004 | armin.rigo | 2007-09-06 10:30:51 +0200 (Thu, 06 Sep 2007) | 4 lines Patch #1733973 by peaker: ptrace_enter_call() assumes no exception is currently set. This assumption is broken when throwing into a generator. ........ r58006 | armin.rigo | 2007-09-06 11:30:38 +0200 (Thu, 06 Sep 2007) | 4 lines PyDict_GetItem() returns a borrowed reference. This attack is against ceval.c:IMPORT_NAME, which calls an object (__builtin__.__import__) without holding a reference to it. ........ r58013 | georg.brandl | 2007-09-06 16:49:56 +0200 (Thu, 06 Sep 2007) | 2 lines Backport from 3k: #1116: fix reference to old filename. ........ r58021 | thomas.heller | 2007-09-06 22:26:20 +0200 (Thu, 06 Sep 2007) | 1 line Fix typo: c_float represents to C float type. ........ r58022 | skip.montanaro | 2007-09-07 00:29:06 +0200 (Fri, 07 Sep 2007) | 3 lines If this is correct for py3k branch and it's already in the release25-maint branch, seems like it ought to be on the trunk as well. ........ r58023 | gregory.p.smith | 2007-09-07 00:59:59 +0200 (Fri, 07 Sep 2007) | 4 lines Apply the fix from Issue1112 to make this test more robust and keep windows happy. ........ r58031 | brett.cannon | 2007-09-07 05:17:50 +0200 (Fri, 07 Sep 2007) | 4 lines Make uuid1 and uuid4 tests conditional on whether ctypes can be imported; implementation of either function depends on ctypes but uuid as a whole does not. ........ r58032 | brett.cannon | 2007-09-07 06:18:30 +0200 (Fri, 07 Sep 2007) | 6 lines Fix a crasher where Python code managed to infinitely recurse in C code without ever going back out to Python code in PyObject_Call(). Required introducing a static RuntimeError instance so that normalizing an exception there is no reliance on a recursive call that would put the exception system over the recursion check itself. ........ r58034 | thomas.heller | 2007-09-07 08:32:17 +0200 (Fri, 07 Sep 2007) | 1 line Add a 'c_longdouble' type to the ctypes module. ........ r58035 | thomas.heller | 2007-09-07 11:30:40 +0200 (Fri, 07 Sep 2007) | 1 line Remove unneeded #include. ........ r58036 | thomas.heller | 2007-09-07 11:33:24 +0200 (Fri, 07 Sep 2007) | 6 lines Backport from py3k branch: Add a workaround for a strange bug on win64, when _ctypes is compiled with the SDK compiler. This should fix the failing Lib\ctypes\test\test_as_parameter.py test. ........ r58037 | georg.brandl | 2007-09-07 16:14:40 +0200 (Fri, 07 Sep 2007) | 2 lines Fix a wrong indentation for sublists. ........ r58043 | georg.brandl | 2007-09-07 22:10:49 +0200 (Fri, 07 Sep 2007) | 2 lines #1095: ln -f doesn't work portably, fix in Makefile. ........ r58049 | skip.montanaro | 2007-09-08 02:34:17 +0200 (Sat, 08 Sep 2007) | 1 line be explicit about the actual location of the missing file ........

author	Thomas Wouters <thomas@python.org>
date	Sat, 08 Sep 2007 17:39:28 +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 @ 43292:876b7ef4775d