cpython-lru_cache-weakref: Python/import.c annotate

annotate Python/import.c @ 75490:2218a6cf75fc 2.7

Moved directory detection into an isdir function

author	Jason R. Coombs <jaraco@jaraco.com>
date	Fri, 13 Jan 2012 17:12:25 -0500
parents	e8a525de2bac
children	6c218b9c5c4c

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 141 diff changeset	1
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Module definition and import implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	4 #include "Python.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35678 diff changeset	6 #include "Python-ast.h"
41526 708c8c5fc173 Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 41178 diff changeset	7 #undef Yield /* undefine macro conflicting with winbase.h */
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35999 diff changeset	8 #include "pyarena.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35678 diff changeset	9 #include "pythonrun.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	10 #include "errcode.h"
263 28f0ffd9facf Support ".pyc" files: cached compilation results. Guido van Rossum <guido@python.org> parents: 228 diff changeset	11 #include "marshal.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35678 diff changeset	12 #include "code.h"
263 28f0ffd9facf Support ".pyc" files: cached compilation results. Guido van Rossum <guido@python.org> parents: 228 diff changeset	13 #include "compile.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 795 diff changeset	14 #include "eval.h"
675 5aff9f8fd299 Move SEP to osdefs.h. Use MAXPATHLEN from osdefs.h. Guido van Rossum <guido@python.org> parents: 630 diff changeset	15 #include "osdefs.h"
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	16 #include "importdl.h"
263 28f0ffd9facf Support ".pyc" files: cached compilation results. Guido van Rossum <guido@python.org> parents: 228 diff changeset	17
14708 89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	18 #ifdef HAVE_FCNTL_H
89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	19 #include <fcntl.h>
89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	20 #endif
37655 2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37488 diff changeset	21 #ifdef __cplusplus
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	22 extern "C" {
37655 2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37488 diff changeset	23 #endif
14708 89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	24
45492 97a1972b672e MS Windows doesn't have mode_t but stat.st_mode is defined as unsigned short. Christian Heimes <christian@cheimes.de> parents: 45470 diff changeset	25 #ifdef MS_WINDOWS
97a1972b672e MS Windows doesn't have mode_t but stat.st_mode is defined as unsigned short. Christian Heimes <christian@cheimes.de> parents: 45470 diff changeset	26 /* for stat.st_mode */
97a1972b672e MS Windows doesn't have mode_t but stat.st_mode is defined as unsigned short. Christian Heimes <christian@cheimes.de> parents: 45470 diff changeset	27 typedef unsigned short mode_t;
37655 2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37488 diff changeset	28 #endif
14708 89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	29
1351 e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	30
31851 adb42a711696 Bump the magic number to avoid sharing bytecode between 2.3 and 2.4. Jeremy Hylton <jeremy@alum.mit.edu> parents: 31824 diff changeset	31 /* Magic word to reject .pyc files generated by other Python versions.
adb42a711696 Bump the magic number to avoid sharing bytecode between 2.3 and 2.4. Jeremy Hylton <jeremy@alum.mit.edu> parents: 31824 diff changeset	32 It should change for each incompatible change to the bytecode.
adb42a711696 Bump the magic number to avoid sharing bytecode between 2.3 and 2.4. Jeremy Hylton <jeremy@alum.mit.edu> parents: 31824 diff changeset	33
adb42a711696 Bump the magic number to avoid sharing bytecode between 2.3 and 2.4. Jeremy Hylton <jeremy@alum.mit.edu> parents: 31824 diff changeset	34 The value of CR and LF is incorporated so if you ever read or write
2812 fb3daf9b2456 new MAGIC; some changes to default files for imp.load_... functions Guido van Rossum <guido@python.org> parents: 2749 diff changeset	35 a .pyc file in text mode the magic number will be wrong; also, the
21010 4a9a9cc041de Since the MAGIC number scheme is going to break on January 1st, document Tim Peters <tim.peters@gmail.com> parents: 20768 diff changeset	36 Apple MPW compiler swaps their values, botching string constants.
21886 abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	37
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32294 diff changeset	38 The magic numbers must be spaced apart atleast 2 values, as the
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32294 diff changeset	39 -U interpeter flag will cause MAGIC+1 being used. They have been
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32294 diff changeset	40 odd numbers for some time now.
21886 abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	41
31851 adb42a711696 Bump the magic number to avoid sharing bytecode between 2.3 and 2.4. Jeremy Hylton <jeremy@alum.mit.edu> parents: 31824 diff changeset	42 There were a variety of old schemes for setting the magic number.
adb42a711696 Bump the magic number to avoid sharing bytecode between 2.3 and 2.4. Jeremy Hylton <jeremy@alum.mit.edu> parents: 31824 diff changeset	43 The current working scheme is to increment the previous value by
adb42a711696 Bump the magic number to avoid sharing bytecode between 2.3 and 2.4. Jeremy Hylton <jeremy@alum.mit.edu> parents: 31824 diff changeset	44 10.
25085 5fe4d93df429 Because MWH changed the bytecode again, moved the magic number back Guido van Rossum <guido@python.org> parents: 24844 diff changeset	45
21886 abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	46 Known values:
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	47 Python 1.5: 20121
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	48 Python 1.5.1: 20121
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	49 Python 1.5.2: 20121
37209 c844305aa8ed Found this in an old email message from Hartmut Goebel. Skip Montanaro <skip@pobox.com> parents: 37086 diff changeset	50 Python 1.6: 50428
21886 abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	51 Python 2.0: 50823
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	52 Python 2.0.1: 50823
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	53 Python 2.1: 60202
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	54 Python 2.1.1: 60202
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	55 Python 2.1.2: 60202
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21712 diff changeset	56 Python 2.2: 60717
23851 d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	57 Python 2.3a0: 62011
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24071 diff changeset	58 Python 2.3a0: 62021
25085 5fe4d93df429 Because MWH changed the bytecode again, moved the magic number back Guido van Rossum <guido@python.org> parents: 24844 diff changeset	59 Python 2.3a0: 62011 (!)
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32294 diff changeset	60 Python 2.4a0: 62041
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 32882 diff changeset	61 Python 2.4a3: 62051
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	62 Python 2.4b1: 62061
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34961 diff changeset	63 Python 2.5a0: 62071
35757 eb15cdd4a2f1 the ast-branch changed the stack discipline of MAKE_CLOSURE, so we need to Michael W. Hudson <mwh@python.net> parents: 35742 diff changeset	64 Python 2.5a0: 62081 (ast-branch)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36501 diff changeset	65 Python 2.5a0: 62091 (with)
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	66 Python 2.5a0: 62092 (changed WITH_CLEANUP opcode)
39300 b745b3fd66a6 Patch #1531113: Fix augmented assignment with yield expressions. Neal Norwitz <nnorwitz@gmail.com> parents: 39253 diff changeset	67 Python 2.5b3: 62101 (fix wrong code: for x, in ...)
b745b3fd66a6 Patch #1531113: Fix augmented assignment with yield expressions. Neal Norwitz <nnorwitz@gmail.com> parents: 39253 diff changeset	68 Python 2.5b3: 62111 (fix wrong code: x += yield)
39365 75bf77367da3 There were really two issues Neal Norwitz <nnorwitz@gmail.com> parents: 39363 diff changeset	69 Python 2.5c1: 62121 (fix wrong lnotab with for loops and
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	70 storing constants that should have been removed)
39753 8dcb882ec3e1 Bug #1520864 (again): unpacking singleton tuples in list comprehensions and Neal Norwitz <nnorwitz@gmail.com> parents: 39468 diff changeset	71 Python 2.5c2: 62131 (fix wrong code: for x, in ... in listcomp/genexp)
44334 07aa19170a67 Speed-up dictionary constructor by about 10%. Raymond Hettinger <python@rcn.com> parents: 44116 diff changeset	72 Python 2.6a0: 62151 (peephole optimizations and STORE_MAP opcode)
45703 343597c7d682 Speed up with statements by storing the __exit__ method on the stack instead of in a temp variable (bumps the magic number for pyc files) Nick Coghlan <ncoghlan@gmail.com> parents: 45492 diff changeset	73 Python 2.6a1: 62161 (WITH_CLEANUP optimization)
50204 94e79d78dff0 Issue #2183: Simplify and optimize bytecode for list comprehensions. Antoine Pitrou <solipsis@pitrou.net> parents: 48920 diff changeset	74 Python 2.7a0: 62171 (optimize list comprehensions/change LIST_APPEND)
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 50671 diff changeset	75 Python 2.7a0: 62181 (optimize conditional branches:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61269 diff changeset	76 introduce POP_JUMP_IF_FALSE and POP_JUMP_IF_TRUE)
54329 145376df3ad7 add a SETUP_WITH opcode Benjamin Peterson <benjamin@python.org> parents: 52720 diff changeset	77 Python 2.7a0 62191 (introduce SETUP_WITH)
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 56007 diff changeset	78 Python 2.7a0 62201 (introduce BUILD_SET)
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	79 Python 2.7a0 62211 (introduce MAP_ADD and SET_ADD)
35757 eb15cdd4a2f1 the ast-branch changed the stack discipline of MAKE_CLOSURE, so we need to Michael W. Hudson <mwh@python.net> parents: 35742 diff changeset	80 .
21010 4a9a9cc041de Since the MAGIC number scheme is going to break on January 1st, document Tim Peters <tim.peters@gmail.com> parents: 20768 diff changeset	81 */
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	82 #define MAGIC (62211 \| ((long)'\r'<<16) \| ((long)'\n'<<24))
487 77b80a91d357 New magic word; and check it. Guido van Rossum <guido@python.org> parents: 340 diff changeset	83
12543 c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	84 /* Magic word as global; note that _PyImport_Init() can change the
13181 6f4669814884 another typo caught by Rob Hooft Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	85 value of this global to accommodate for alterations of how the
12543 c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	86 compiler works which are enabled by command line switches. */
c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	87 static long pyc_magic = MAGIC;
c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	88
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	89 /* See _PyImport_FixupExtension() below */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	90 static PyObject *extensions = NULL;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	91
6541 b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	92 /* This table is defined in config.c: */
b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	93 extern struct _inittab _PyImport_Inittab[];
b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	94
b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	95 struct _inittab *PyImport_Inittab = _PyImport_Inittab;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	96
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	97 /* these tables define the module suffixes that Python recognizes */
5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	98 struct filedescr * _PyImport_Filetab = NULL;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	99
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	100 #ifdef RISCOS
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	101 static const struct filedescr _PyImport_StandardFiletab[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	102 {"/py", "U", PY_SOURCE},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	103 {"/pyc", "rb", PY_COMPILED},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	104 {0, 0}
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	105 };
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	106 #else
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	107 static const struct filedescr _PyImport_StandardFiletab[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	108 {".py", "U", PY_SOURCE},
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23879 diff changeset	109 #ifdef MS_WINDOWS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	110 {".pyw", "U", PY_SOURCE},
21010 4a9a9cc041de Since the MAGIC number scheme is going to break on January 1st, document Tim Peters <tim.peters@gmail.com> parents: 20768 diff changeset	111 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	112 {".pyc", "rb", PY_COMPILED},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	113 {0, 0}
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	114 };
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	115 #endif
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	116
75490 2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	117 #ifdef HAVE_STAT
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	118 int isdir(char *path) {
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	119 struct stat statbuf;
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	120 return stat(path, &statbuf) == 0 && S_ISDIR(statbuf.st_mode);
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	121 }
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	122 #else
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	123 /* with RISCOS, isdir is in unixstuff */
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	124 #ifndef RISCOS
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	125 int isdir(char *path) {
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	126 return 0;
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	127 }
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	128 #endif
2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	129 #endif
39253 3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	130
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	131 /* Initialize things */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	132
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	133 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	134 _PyImport_Init(void)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	135 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	136 const struct filedescr *scan;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	137 struct filedescr *filetab;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	138 int countD = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	139 int countS = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	140
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	141 /* prepare _PyImport_Filetab: copy entries from
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	142 _PyImport_DynLoadFiletab and _PyImport_StandardFiletab.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	143 */
42736 ddefbdbdbcb5 Backport fix of #1752175. Georg Brandl <georg@python.org> parents: 41573 diff changeset	144 #ifdef HAVE_DYNAMIC_LOADING
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	145 for (scan = _PyImport_DynLoadFiletab; scan->suffix != NULL; ++scan)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	146 ++countD;
42736 ddefbdbdbcb5 Backport fix of #1752175. Georg Brandl <georg@python.org> parents: 41573 diff changeset	147 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	148 for (scan = _PyImport_StandardFiletab; scan->suffix != NULL; ++scan)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	149 ++countS;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	150 filetab = PyMem_NEW(struct filedescr, countD + countS + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	151 if (filetab == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	152 Py_FatalError("Can't initialize import file table.");
42736 ddefbdbdbcb5 Backport fix of #1752175. Georg Brandl <georg@python.org> parents: 41573 diff changeset	153 #ifdef HAVE_DYNAMIC_LOADING
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	154 memcpy(filetab, _PyImport_DynLoadFiletab,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	155 countD * sizeof(struct filedescr));
42736 ddefbdbdbcb5 Backport fix of #1752175. Georg Brandl <georg@python.org> parents: 41573 diff changeset	156 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	157 memcpy(filetab + countD, _PyImport_StandardFiletab,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	158 countS * sizeof(struct filedescr));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	159 filetab[countD + countS].suffix = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	160
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	161 _PyImport_Filetab = filetab;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	162
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	163 if (Py_OptimizeFlag) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	164 /* Replace ".pyc" with ".pyo" in _PyImport_Filetab */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	165 for (; filetab->suffix != NULL; filetab++) {
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	166 #ifndef RISCOS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	167 if (strcmp(filetab->suffix, ".pyc") == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	168 filetab->suffix = ".pyo";
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	169 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	170 if (strcmp(filetab->suffix, "/pyc") == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	171 filetab->suffix = "/pyo";
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	172 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	173 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	174 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	175
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	176 if (Py_UnicodeFlag) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	177 /* Fix the pyc_magic so that byte compiled code created
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	178 using the all-Unicode method doesn't interfere with
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	179 code created in normal operation mode. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	180 pyc_magic = MAGIC + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	181 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	182 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	183
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	184 void
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	185 _PyImportHooks_Init(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	186 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	187 PyObject v, path_hooks = NULL, *zimpimport;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	188 int err = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	189
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	190 /* adding sys.path_hooks and sys.path_importer_cache, setting up
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	191 zipimport */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	192 if (PyType_Ready(&PyNullImporter_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	193 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	194
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	195 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	196 PySys_WriteStderr("# installing zipimport hook\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	197
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	198 v = PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	199 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	200 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	201 err = PySys_SetObject("meta_path", v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	202 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	203 if (err)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	204 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	205 v = PyDict_New();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	206 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	207 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	208 err = PySys_SetObject("path_importer_cache", v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	209 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	210 if (err)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	211 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	212 path_hooks = PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	213 if (path_hooks == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	214 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	215 err = PySys_SetObject("path_hooks", path_hooks);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	216 if (err) {
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	217 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	218 PyErr_Print();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	219 Py_FatalError("initializing sys.meta_path, sys.path_hooks, "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	220 "path_importer_cache, or NullImporter failed"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	221 );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	222 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	223
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	224 zimpimport = PyImport_ImportModule("zipimport");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	225 if (zimpimport == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	226 PyErr_Clear(); /* No zip import module -- okay */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	227 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	228 PySys_WriteStderr("# can't import zipimport\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	229 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	230 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	231 PyObject *zipimporter = PyObject_GetAttrString(zimpimport,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	232 "zipimporter");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	233 Py_DECREF(zimpimport);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	234 if (zipimporter == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	235 PyErr_Clear(); /* No zipimporter object -- okay */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	236 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	237 PySys_WriteStderr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	238 "# can't import zipimport.zipimporter\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	239 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	240 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	241 /* sys.path_hooks.append(zipimporter) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	242 err = PyList_Append(path_hooks, zipimporter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	243 Py_DECREF(zipimporter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	244 if (err)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	245 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	246 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	247 PySys_WriteStderr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	248 "# installed zipimport hook\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	249 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	250 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	251 Py_DECREF(path_hooks);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	252 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	253
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	254 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	255 _PyImport_Fini(void)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	256 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	257 Py_XDECREF(extensions);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	258 extensions = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	259 PyMem_DEL(_PyImport_Filetab);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	260 _PyImport_Filetab = NULL;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	261 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	262
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	263
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	264 /* Locking primitives to prevent parallel imports of the same module
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	265 in different threads to return with a partially loaded module.
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	266 These calls are serialized by the global interpreter lock. */
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	267
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	268 #ifdef WITH_THREAD
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	269
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9187 diff changeset	270 #include "pythread.h"
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	271
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9431 diff changeset	272 static PyThread_type_lock import_lock = 0;
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	273 static long import_lock_thread = -1;
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	274 static int import_lock_level = 0;
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	275
56008 1ad9f2bda20a Merged revisions 74841 via svnmerge from Thomas Wouters <thomas@python.org> parents: 55330 diff changeset	276 void
1ad9f2bda20a Merged revisions 74841 via svnmerge from Thomas Wouters <thomas@python.org> parents: 55330 diff changeset	277 _PyImport_AcquireLock(void)
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	278 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	279 long me = PyThread_get_thread_ident();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	280 if (me == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	281 return; /* Too bad */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	282 if (import_lock == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	283 import_lock = PyThread_allocate_lock();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	284 if (import_lock == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	285 return; /* Nothing much we can do. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	286 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	287 if (import_lock_thread == me) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	288 import_lock_level++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	289 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	290 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	291 if (import_lock_thread != -1 \|\| !PyThread_acquire_lock(import_lock, 0))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	292 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	293 PyThreadState *tstate = PyEval_SaveThread();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	294 PyThread_acquire_lock(import_lock, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	295 PyEval_RestoreThread(tstate);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	296 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	297 import_lock_thread = me;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	298 import_lock_level = 1;
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	299 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	300
56008 1ad9f2bda20a Merged revisions 74841 via svnmerge from Thomas Wouters <thomas@python.org> parents: 55330 diff changeset	301 int
1ad9f2bda20a Merged revisions 74841 via svnmerge from Thomas Wouters <thomas@python.org> parents: 55330 diff changeset	302 _PyImport_ReleaseLock(void)
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	303 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	304 long me = PyThread_get_thread_ident();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	305 if (me == -1 \|\| import_lock == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	306 return 0; /* Too bad */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	307 if (import_lock_thread != me)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	308 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	309 import_lock_level--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	310 if (import_lock_level == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	311 import_lock_thread = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	312 PyThread_release_lock(import_lock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	313 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	314 return 1;
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	315 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	316
35550 724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	317 /* This function is called from PyOS_AfterFork to ensure that newly
59226 d5f50ae4f1f7 Merged revisions 78527,78531 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 56008 diff changeset	318 created child processes do not share locks with the parent.
d5f50ae4f1f7 Merged revisions 78527,78531 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 56008 diff changeset	319 We now acquire the import lock around fork() calls but on some platforms
d5f50ae4f1f7 Merged revisions 78527,78531 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 56008 diff changeset	320 (Solaris 9 and earlier? see isue7242) that still left us with problems. */
35550 724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	321
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	322 void
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	323 _PyImport_ReInitLock(void)
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	324 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	325 if (import_lock != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	326 import_lock = PyThread_allocate_lock();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	327 import_lock_thread = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	328 import_lock_level = 0;
35550 724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	329 }
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	330
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	331 #endif
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	332
19596 1be18ef869a4 Add a new function imp.lock_held(), and use it to skip test_threaded_import Tim Peters <tim.peters@gmail.com> parents: 19238 diff changeset	333 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	334 imp_lock_held(PyObject self, PyObject noargs)
19596 1be18ef869a4 Add a new function imp.lock_held(), and use it to skip test_threaded_import Tim Peters <tim.peters@gmail.com> parents: 19238 diff changeset	335 {
1be18ef869a4 Add a new function imp.lock_held(), and use it to skip test_threaded_import Tim Peters <tim.peters@gmail.com> parents: 19238 diff changeset	336 #ifdef WITH_THREAD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	337 return PyBool_FromLong(import_lock_thread != -1);
19596 1be18ef869a4 Add a new function imp.lock_held(), and use it to skip test_threaded_import Tim Peters <tim.peters@gmail.com> parents: 19238 diff changeset	338 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	339 return PyBool_FromLong(0);
19596 1be18ef869a4 Add a new function imp.lock_held(), and use it to skip test_threaded_import Tim Peters <tim.peters@gmail.com> parents: 19238 diff changeset	340 #endif
1be18ef869a4 Add a new function imp.lock_held(), and use it to skip test_threaded_import Tim Peters <tim.peters@gmail.com> parents: 19238 diff changeset	341 }
1be18ef869a4 Add a new function imp.lock_held(), and use it to skip test_threaded_import Tim Peters <tim.peters@gmail.com> parents: 19238 diff changeset	342
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	343 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	344 imp_acquire_lock(PyObject self, PyObject noargs)
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	345 {
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	346 #ifdef WITH_THREAD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	347 _PyImport_AcquireLock();
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	348 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	349 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	350 return Py_None;
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	351 }
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	352
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	353 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	354 imp_release_lock(PyObject self, PyObject noargs)
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	355 {
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	356 #ifdef WITH_THREAD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	357 if (_PyImport_ReleaseLock() < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	358 PyErr_SetString(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	359 "not holding the import lock");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	360 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	361 }
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	362 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	363 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	364 return Py_None;
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	365 }
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	366
41131 66f265ac4ec4 Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Collin Winter <collinw@gmail.com> parents: 39827 diff changeset	367 static void
41139 9db3e325dd88 Fix some style nits: Neal Norwitz <nnorwitz@gmail.com> parents: 41128 diff changeset	368 imp_modules_reloading_clear(void)
41131 66f265ac4ec4 Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Collin Winter <collinw@gmail.com> parents: 39827 diff changeset	369 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	370 PyInterpreterState *interp = PyThreadState_Get()->interp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	371 if (interp->modules_reloading != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	372 PyDict_Clear(interp->modules_reloading);
41131 66f265ac4ec4 Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Collin Winter <collinw@gmail.com> parents: 39827 diff changeset	373 }
66f265ac4ec4 Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Collin Winter <collinw@gmail.com> parents: 39827 diff changeset	374
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	375 /* Helper for sys */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	376
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	377 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	378 PyImport_GetModuleDict(void)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	379 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	380 PyInterpreterState *interp = PyThreadState_GET()->interp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	381 if (interp->modules == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	382 Py_FatalError("PyImport_GetModuleDict: no module dictionary!");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	383 return interp->modules;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	384 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	385
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	386
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	387 /* List of names to clear in sys */
fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	388 static char* sys_deletes[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	389 "path", "argv", "ps1", "ps2", "exitfunc",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	390 "exc_type", "exc_value", "exc_traceback",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	391 "last_type", "last_value", "last_traceback",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	392 "path_hooks", "path_importer_cache", "meta_path",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	393 /* misc stuff */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	394 "flags", "float_info",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	395 NULL
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	396 };
fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	397
7403 185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	398 static char* sys_files[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	399 "stdin", "__stdin__",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	400 "stdout", "__stdout__",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	401 "stderr", "__stderr__",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	402 NULL
7403 185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	403 };
185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	404
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	405
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	406 /* Un-initialize things, as good as we can */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	407
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	408 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	409 PyImport_Cleanup(void)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	410 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	411 Py_ssize_t pos, ndone;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	412 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	413 PyObject key, value, *dict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	414 PyInterpreterState *interp = PyThreadState_GET()->interp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	415 PyObject *modules = interp->modules;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	416
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	417 if (modules == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	418 return; /* Already done */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	419
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	420 /* Delete some special variables first. These are common
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	421 places where user values hide and people complain when their
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	422 destructors fail. Since the modules containing them are
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	423 deleted last of all, they would come too late in the normal
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	424 destruction order. Sigh. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	425
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	426 value = PyDict_GetItemString(modules, "__builtin__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	427 if (value != NULL && PyModule_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	428 dict = PyModule_GetDict(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	429 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	430 PySys_WriteStderr("# clear __builtin__._\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	431 PyDict_SetItemString(dict, "_", Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	432 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	433 value = PyDict_GetItemString(modules, "sys");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	434 if (value != NULL && PyModule_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	435 char **p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	436 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	437 dict = PyModule_GetDict(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	438 for (p = sys_deletes; *p != NULL; p++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	439 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	440 PySys_WriteStderr("# clear sys.%s\n", *p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	441 PyDict_SetItemString(dict, *p, Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	442 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	443 for (p = sys_files; *p != NULL; p+=2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	444 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	445 PySys_WriteStderr("# restore sys.%s\n", *p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	446 v = PyDict_GetItemString(dict, *(p+1));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	447 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	448 v = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	449 PyDict_SetItemString(dict, *p, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	450 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	451 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	452
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	453 /* First, delete __main__ */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	454 value = PyDict_GetItemString(modules, "__main__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	455 if (value != NULL && PyModule_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	456 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	457 PySys_WriteStderr("# cleanup __main__\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	458 _PyModule_Clear(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	459 PyDict_SetItemString(modules, "__main__", Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	460 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	461
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	462 /* The special treatment of __builtin__ here is because even
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	463 when it's not referenced as a module, its dictionary is
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	464 referenced by almost every module's __builtins__. Since
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	465 deleting a module clears its dictionary (even if there are
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	466 references left to it), we need to delete the __builtin__
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	467 module last. Likewise, we don't delete sys until the very
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	468 end because it is implicitly referenced (e.g. by print).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	469
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	470 Also note that we 'delete' modules by replacing their entry
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	471 in the modules dict with None, rather than really deleting
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	472 them; this avoids a rehash of the modules dictionary and
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	473 also marks them as "non existent" so they won't be
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	474 re-imported. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	475
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	476 /* Next, repeatedly delete modules with a reference count of
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	477 one (skipping __builtin__ and sys) and delete them */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	478 do {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	479 ndone = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	480 pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	481 while (PyDict_Next(modules, &pos, &key, &value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	482 if (value->ob_refcnt != 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	483 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	484 if (PyString_Check(key) && PyModule_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	485 name = PyString_AS_STRING(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	486 if (strcmp(name, "__builtin__") == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	487 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	488 if (strcmp(name, "sys") == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	489 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	490 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	491 PySys_WriteStderr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	492 "# cleanup[1] %s\n", name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	493 _PyModule_Clear(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	494 PyDict_SetItem(modules, key, Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	495 ndone++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	496 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	497 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	498 } while (ndone > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	499
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	500 /* Next, delete all modules (still skipping __builtin__ and sys) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	501 pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	502 while (PyDict_Next(modules, &pos, &key, &value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	503 if (PyString_Check(key) && PyModule_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	504 name = PyString_AS_STRING(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	505 if (strcmp(name, "__builtin__") == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	506 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	507 if (strcmp(name, "sys") == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	508 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	509 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	510 PySys_WriteStderr("# cleanup[2] %s\n", name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	511 _PyModule_Clear(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	512 PyDict_SetItem(modules, key, Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	513 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	514 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	515
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	516 /* Next, delete sys and __builtin__ (in that order) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	517 value = PyDict_GetItemString(modules, "sys");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	518 if (value != NULL && PyModule_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	519 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	520 PySys_WriteStderr("# cleanup sys\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	521 _PyModule_Clear(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	522 PyDict_SetItemString(modules, "sys", Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	523 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	524 value = PyDict_GetItemString(modules, "__builtin__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	525 if (value != NULL && PyModule_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	526 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	527 PySys_WriteStderr("# cleanup __builtin__\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	528 _PyModule_Clear(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	529 PyDict_SetItemString(modules, "__builtin__", Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	530 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	531
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	532 /* Finally, clear and delete the modules directory */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	533 PyDict_Clear(modules);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	534 interp->modules = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	535 Py_DECREF(modules);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	536 Py_CLEAR(interp->modules_reloading);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	537 }
166 28923e44254c Added forward declaration (to satisfy Standard C). Guido van Rossum <guido@python.org> parents: 145 diff changeset	538
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	539
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	540 /* Helper for pythonrun.c -- return magic number */
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	541
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	542 long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	543 PyImport_GetMagicNumber(void)
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	544 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	545 return pyc_magic;
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	546 }
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	547
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	548
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	549 /* Magic for extension modules (built-in as well as dynamically
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	550 loaded). To prevent initializing an extension module more than
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	551 once, we keep a static dictionary 'extensions' keyed by module name
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	552 (for built-in modules) or by filename (for dynamically loaded
19238 5b87ee44000b Fixed typo in comment leading up to _PyImport_FixupExtension(). Barry Warsaw <barry@python.org> parents: 19063 diff changeset	553 modules), containing these modules. A copy of the module's
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	554 dictionary is stored by calling _PyImport_FixupExtension()
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	555 immediately after the module initialization function succeeds. A
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	556 copy can be retrieved from there by calling
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	557 _PyImport_FindExtension(). */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	558
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	559 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	560 _PyImport_FixupExtension(char name, char filename)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	561 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	562 PyObject modules, mod, dict, copy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	563 if (extensions == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	564 extensions = PyDict_New();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	565 if (extensions == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	566 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	567 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	568 modules = PyImport_GetModuleDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	569 mod = PyDict_GetItemString(modules, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	570 if (mod == NULL \|\| !PyModule_Check(mod)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	571 PyErr_Format(PyExc_SystemError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	572 "_PyImport_FixupExtension: module %.200s not loaded", name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	573 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	574 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	575 dict = PyModule_GetDict(mod);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	576 if (dict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	577 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	578 copy = PyDict_Copy(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	579 if (copy == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	580 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	581 PyDict_SetItemString(extensions, filename, copy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	582 Py_DECREF(copy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	583 return copy;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	584 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	585
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	586 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	587 _PyImport_FindExtension(char name, char filename)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	588 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	589 PyObject dict, mod, *mdict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	590 if (extensions == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	591 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	592 dict = PyDict_GetItemString(extensions, filename);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	593 if (dict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	594 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	595 mod = PyImport_AddModule(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	596 if (mod == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	597 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	598 mdict = PyModule_GetDict(mod);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	599 if (mdict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	600 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	601 if (PyDict_Update(mdict, dict))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	602 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	603 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	604 PySys_WriteStderr("import %s # previously loaded (%s)\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	605 name, filename);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	606 return mod;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	607 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	608
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	609
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	610 /* Get the module object corresponding to a module name.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	611 First check the modules dictionary if there's one there,
30722 651fc8d98d99 Fix a bunch of typos in documentation, docstrings and comments. Walter Dörwald <walter@livinglogic.de> parents: 30311 diff changeset	612 if not, create a new one and insert it in the modules dictionary.
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	613 Because the former action is most common, THIS DOES NOT RETURN A
27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	614 'NEW' REFERENCE! */
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	615
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	616 PyObject *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35757 diff changeset	617 PyImport_AddModule(const char *name)
40 f28ac7f621c7 Added reload() functionality. Guido van Rossum <guido@python.org> parents: 6 diff changeset	618 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	619 PyObject *modules = PyImport_GetModuleDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	620 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	621
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	622 if ((m = PyDict_GetItemString(modules, name)) != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	623 PyModule_Check(m))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	624 return m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	625 m = PyModule_New(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	626 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	627 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	628 if (PyDict_SetItemString(modules, name, m) != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	629 Py_DECREF(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	630 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	631 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	632 Py_DECREF(m); /* Yes, it still exists, in modules! */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	633
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	634 return m;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	635 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	636
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	637 /* Remove name from sys.modules, if it's there. */
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	638 static void
60021 16a7d32605bb make naming convention consistent Benjamin Peterson <benjamin@python.org> parents: 59499 diff changeset	639 remove_module(const char *name)
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	640 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	641 PyObject *modules = PyImport_GetModuleDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	642 if (PyDict_GetItemString(modules, name) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	643 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	644 if (PyDict_DelItemString(modules, name) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	645 Py_FatalError("import: deleting existing key in"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	646 "sys.modules failed");
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	647 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	648
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	649 /* Execute a code object in a module and return the module object
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	650 * WITH INCREMENTED REFERENCE COUNT. If an error occurs, name is
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	651 * removed from sys.modules, to avoid leaving damaged module objects
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	652 * in sys.modules. The caller may wish to restore the original
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	653 * module object (if any) in this case; PyImport_ReloadModule is an
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	654 * example.
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	655 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	656 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	657 PyImport_ExecCodeModule(char name, PyObject co)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	658 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	659 return PyImport_ExecCodeModuleEx(name, co, (char *)NULL);
7232 74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	660 }
74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	661
74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	662 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	663 PyImport_ExecCodeModuleEx(char name, PyObject co, char *pathname)
7232 74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	664 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	665 PyObject *modules = PyImport_GetModuleDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	666 PyObject m, d, *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	667
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	668 m = PyImport_AddModule(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	669 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	670 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	671 /* If the module is being reloaded, we get the old module back
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	672 and re-use its dict to exec the new code. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	673 d = PyModule_GetDict(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	674 if (PyDict_GetItemString(d, "__builtins__") == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	675 if (PyDict_SetItemString(d, "__builtins__",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	676 PyEval_GetBuiltins()) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	677 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	678 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	679 /* Remember the filename as the __file__ attribute */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	680 v = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	681 if (pathname != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	682 v = PyString_FromString(pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	683 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	684 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	685 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	686 if (v == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	687 v = ((PyCodeObject *)co)->co_filename;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	688 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	689 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	690 if (PyDict_SetItemString(d, "__file__", v) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	691 PyErr_Clear(); /* Not important enough to report */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	692 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	693
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	694 v = PyEval_EvalCode((PyCodeObject *)co, d, d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	695 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	696 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	697 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	698
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	699 if ((m = PyDict_GetItemString(modules, name)) == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	700 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	701 "Loaded module %.200s not found in sys.modules",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	702 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	703 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	704 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	705
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	706 Py_INCREF(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	707
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	708 return m;
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	709
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	710 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61269 diff changeset	711 remove_module(name);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	712 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	713 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	714
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	715
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	716 /* Given a pathname for a Python source file, fill a buffer with the
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	717 pathname for the corresponding compiled file. Return the pathname
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	718 for the compiled file, or NULL if there's no space in the buffer.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	719 Doesn't set an exception. */
609 0ad5b35e3ad8 Support for dynamic loading added. Guido van Rossum <guido@python.org> parents: 510 diff changeset	720
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	721 static char *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	722 make_compiled_pathname(char pathname, char buf, size_t buflen)
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	723 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	724 size_t len = strlen(pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	725 if (len+2 > buflen)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	726 return NULL;
18992 7fa1f87ca6b2 Derived from SF patch #446899 Permit import of .pyw under Windows, from Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	727
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23879 diff changeset	728 #ifdef MS_WINDOWS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	729 /* Treat .pyw as if it were .py. The case of ".pyw" must match
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	730 that used in _PyImport_StandardFiletab. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	731 if (len >= 4 && strcmp(&pathname[len-4], ".pyw") == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	732 --len; /* pretend 'w' isn't there */
18992 7fa1f87ca6b2 Derived from SF patch #446899 Permit import of .pyw under Windows, from Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	733 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	734 memcpy(buf, pathname, len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	735 buf[len] = Py_OptimizeFlag ? 'o' : 'c';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	736 buf[len+1] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	737
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	738 return buf;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	739 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	740
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	741
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	742 /* Given a pathname for a Python source file, its time of last
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	743 modification, and a pathname for a compiled file, check whether the
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	744 compiled file represents the same version of the source. If so,
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	745 return a FILE pointer for the compiled file, positioned just after
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	746 the header; if not, return NULL.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	747 Doesn't set an exception. */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	748
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	749 static FILE *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	750 check_compiled_module(char pathname, time_t mtime, char cpathname)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	751 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	752 FILE *fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	753 long magic;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	754 long pyc_mtime;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	755
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	756 fp = fopen(cpathname, "rb");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	757 if (fp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	758 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	759 magic = PyMarshal_ReadLongFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	760 if (magic != pyc_magic) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	761 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	762 PySys_WriteStderr("# %s has bad magic\n", cpathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	763 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	764 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	765 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	766 pyc_mtime = PyMarshal_ReadLongFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	767 if (pyc_mtime != mtime) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	768 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	769 PySys_WriteStderr("# %s has bad mtime\n", cpathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	770 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	771 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	772 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	773 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	774 PySys_WriteStderr("# %s matches %s\n", cpathname, pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	775 return fp;
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	776 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	777
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	778
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	779 /* Read a code object from a file and check it for validity */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	780
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	781 static PyCodeObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	782 read_compiled_module(char cpathname, FILE fp)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	783 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	784 PyObject *co;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	785
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	786 co = PyMarshal_ReadLastObjectFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	787 if (co == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	788 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	789 if (!PyCode_Check(co)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	790 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	791 "Non-code object in %.200s", cpathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	792 Py_DECREF(co);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	793 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	794 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	795 return (PyCodeObject *)co;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	796 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	797
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	798
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	799 /* Load a module from a compiled file, execute it, and return its
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	800 module object WITH INCREMENTED REFERENCE COUNT */
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	801
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	802 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	803 load_compiled_module(char name, char cpathname, FILE *fp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	804 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	805 long magic;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	806 PyCodeObject *co;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	807 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	808
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	809 magic = PyMarshal_ReadLongFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	810 if (magic != pyc_magic) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	811 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	812 "Bad magic number in %.200s", cpathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	813 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	814 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	815 (void) PyMarshal_ReadLongFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	816 co = read_compiled_module(cpathname, fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	817 if (co == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	818 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	819 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	820 PySys_WriteStderr("import %s # precompiled from %s\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	821 name, cpathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	822 m = PyImport_ExecCodeModuleEx(name, (PyObject *)co, cpathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	823 Py_DECREF(co);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	824
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	825 return m;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	826 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	827
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	828 /* Parse a source file and return the corresponding code object */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	829
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	830 static PyCodeObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35678 diff changeset	831 parse_source_module(const char pathname, FILE fp)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	832 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	833 PyCodeObject *co = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	834 mod_ty mod;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	835 PyCompilerFlags flags;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	836 PyArena *arena = PyArena_New();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	837 if (arena == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	838 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	839
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	840 flags.cf_flags = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	841
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	842 mod = PyParser_ASTFromFile(fp, pathname, Py_file_input, 0, 0, &flags,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	843 NULL, arena);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	844 if (mod) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	845 co = PyAST_Compile(mod, pathname, NULL, arena);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	846 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	847 PyArena_Free(arena);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	848 return co;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	849 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	850
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	851
14708 89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	852 /* Helper to open a bytecode file for writing in exclusive mode */
89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	853
89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	854 static FILE *
45470 3915d5f650fa Issue #2051 and patch from Alexander Belopolsky: Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	855 open_exclusive(char *filename, mode_t mode)
14708 89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	856 {
89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	857 #if defined(O_EXCL)&&defined(O_CREAT)&&defined(O_WRONLY)&&defined(O_TRUNC)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	858 /* Use O_EXCL to avoid a race condition when another process tries to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	859 write the same file. When that happens, our open() call fails,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	860 which is just fine (since it's only a cache).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	861 XXX If the file exists and is writable but the directory is not
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	862 writable, the file will never be written. Oh well.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	863 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	864 int fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	865 (void) unlink(filename);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	866 fd = open(filename, O_EXCL\|O_CREAT\|O_WRONLY\|O_TRUNC
14921 3db8b8031a6a The 2.0b2 change to write .pyc files in exclusive mode (if possible) Tim Peters <tim.peters@gmail.com> parents: 14708 diff changeset	867 #ifdef O_BINARY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	868 \|O_BINARY /* necessary for Windows */
14921 3db8b8031a6a The 2.0b2 change to write .pyc files in exclusive mode (if possible) Tim Peters <tim.peters@gmail.com> parents: 14708 diff changeset	869 #endif
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26461 diff changeset	870 #ifdef __VMS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	871 , mode, "ctxt=bin", "shr=nil"
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26461 diff changeset	872 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	873 , mode
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26461 diff changeset	874 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	875 );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	876 if (fd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	877 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	878 return fdopen(fd, "wb");
14708 89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	879 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	880 /* Best we can do -- on Windows this can't happen anyway */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	881 return fopen(filename, "wb");
14708 89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	882 #endif
89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	883 }
89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	884
89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	885
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	886 /* Write a compiled module to a file, placing the time of last
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	887 modification of its source into the header.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	888 Errors are ignored, if a write error occurs an attempt is made to
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	889 remove the file. */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	890
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	891 static void
45470 3915d5f650fa Issue #2051 and patch from Alexander Belopolsky: Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	892 write_compiled_module(PyCodeObject co, char cpathname, struct stat *srcstat)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	893 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	894 FILE *fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	895 time_t mtime = srcstat->st_mtime;
55330 f20705875e80 Merged revisions 73870,73879,73899-73900,73905-73906 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 50786 diff changeset	896 #ifdef MS_WINDOWS /* since Windows uses different permissions */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	897 mode_t mode = srcstat->st_mode & ~S_IEXEC;
55330 f20705875e80 Merged revisions 73870,73879,73899-73900,73905-73906 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 50786 diff changeset	898 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	899 mode_t mode = srcstat->st_mode & ~S_IXUSR & ~S_IXGRP & ~S_IXOTH;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	900 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	901
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	902 fp = open_exclusive(cpathname, mode);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	903 if (fp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	904 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	905 PySys_WriteStderr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	906 "# can't create %s\n", cpathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	907 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	908 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	909 PyMarshal_WriteLongToFile(pyc_magic, fp, Py_MARSHAL_VERSION);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	910 /* First write a 0 for mtime */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	911 PyMarshal_WriteLongToFile(0L, fp, Py_MARSHAL_VERSION);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	912 PyMarshal_WriteObjectToFile((PyObject *)co, fp, Py_MARSHAL_VERSION);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	913 if (fflush(fp) != 0 \|\| ferror(fp)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	914 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	915 PySys_WriteStderr("# can't write %s\n", cpathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	916 /* Don't keep partial file */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	917 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	918 (void) unlink(cpathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	919 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	920 }
74610 e8a525de2bac Remove debug output, fix assert (hopefully) and exercise signedness issues a bit more. Antoine Pitrou <solipsis@pitrou.net> parents: 74609 diff changeset	921 /* Now write the true mtime (as a 32-bit field) */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	922 fseek(fp, 4L, 0);
74610 e8a525de2bac Remove debug output, fix assert (hopefully) and exercise signedness issues a bit more. Antoine Pitrou <solipsis@pitrou.net> parents: 74609 diff changeset	923 assert(mtime <= 0xFFFFFFFF);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	924 PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	925 fflush(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	926 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	927 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	928 PySys_WriteStderr("# wrote %s\n", cpathname);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	929 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	930
50618 617199769bd3 Merged revisions 68360 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48920 diff changeset	931 static void
617199769bd3 Merged revisions 68360 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48920 diff changeset	932 update_code_filenames(PyCodeObject co, PyObject oldname, PyObject *newname)
617199769bd3 Merged revisions 68360 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48920 diff changeset	933 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	934 PyObject constants, tmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	935 Py_ssize_t i, n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	936
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	937 if (!_PyString_Eq(co->co_filename, oldname))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	938 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	939
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	940 tmp = co->co_filename;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	941 co->co_filename = newname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	942 Py_INCREF(co->co_filename);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	943 Py_DECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	944
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	945 constants = co->co_consts;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	946 n = PyTuple_GET_SIZE(constants);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	947 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	948 tmp = PyTuple_GET_ITEM(constants, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	949 if (PyCode_Check(tmp))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	950 update_code_filenames((PyCodeObject *)tmp,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	951 oldname, newname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	952 }
50618 617199769bd3 Merged revisions 68360 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48920 diff changeset	953 }
617199769bd3 Merged revisions 68360 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48920 diff changeset	954
617199769bd3 Merged revisions 68360 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48920 diff changeset	955 static int
617199769bd3 Merged revisions 68360 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48920 diff changeset	956 update_compiled_module(PyCodeObject co, char pathname)
617199769bd3 Merged revisions 68360 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48920 diff changeset	957 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	958 PyObject oldname, newname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	959
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	960 if (strcmp(PyString_AsString(co->co_filename), pathname) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	961 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	962
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	963 newname = PyString_FromString(pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	964 if (newname == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	965 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	966
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	967 oldname = co->co_filename;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	968 Py_INCREF(oldname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	969 update_code_filenames(co, oldname, newname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	970 Py_DECREF(oldname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	971 Py_DECREF(newname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	972 return 1;
50618 617199769bd3 Merged revisions 68360 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48920 diff changeset	973 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	974
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	975 /* Load a source module from a given file and return its module
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	976 object WITH INCREMENTED REFERENCE COUNT. If there's a matching
27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	977 byte-compiled file, use that instead. */
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	978
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	979 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	980 load_source_module(char name, char pathname, FILE *fp)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	981 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	982 struct stat st;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	983 FILE *fpc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	984 char buf[MAXPATHLEN+1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	985 char *cpathname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	986 PyCodeObject *co;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	987 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	988
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	989 if (fstat(fileno(fp), &st) != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	990 PyErr_Format(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	991 "unable to get file status from '%s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	992 pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	993 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	994 }
74605 0bec943f6778 Make guard more dynamic (apparently the size of a filesystem timestamp may vary under Windows). Antoine Pitrou <solipsis@pitrou.net> parents: 74598 diff changeset	995 if (sizeof st.st_mtime > 4) {
0bec943f6778 Make guard more dynamic (apparently the size of a filesystem timestamp may vary under Windows). Antoine Pitrou <solipsis@pitrou.net> parents: 74598 diff changeset	996 /* Python's .pyc timestamp handling presumes that the timestamp fits
0bec943f6778 Make guard more dynamic (apparently the size of a filesystem timestamp may vary under Windows). Antoine Pitrou <solipsis@pitrou.net> parents: 74598 diff changeset	997 in 4 bytes. Since the code only does an equality comparison,
0bec943f6778 Make guard more dynamic (apparently the size of a filesystem timestamp may vary under Windows). Antoine Pitrou <solipsis@pitrou.net> parents: 74598 diff changeset	998 ordering is not important and we can safely ignore the higher bits
0bec943f6778 Make guard more dynamic (apparently the size of a filesystem timestamp may vary under Windows). Antoine Pitrou <solipsis@pitrou.net> parents: 74598 diff changeset	999 (collisions are extremely unlikely).
0bec943f6778 Make guard more dynamic (apparently the size of a filesystem timestamp may vary under Windows). Antoine Pitrou <solipsis@pitrou.net> parents: 74598 diff changeset	1000 */
0bec943f6778 Make guard more dynamic (apparently the size of a filesystem timestamp may vary under Windows). Antoine Pitrou <solipsis@pitrou.net> parents: 74598 diff changeset	1001 st.st_mtime &= 0xFFFFFFFF;
0bec943f6778 Make guard more dynamic (apparently the size of a filesystem timestamp may vary under Windows). Antoine Pitrou <solipsis@pitrou.net> parents: 74598 diff changeset	1002 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1003 cpathname = make_compiled_pathname(pathname, buf,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1004 (size_t)MAXPATHLEN + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1005 if (cpathname != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1006 (fpc = check_compiled_module(pathname, st.st_mtime, cpathname))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1007 co = read_compiled_module(cpathname, fpc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1008 fclose(fpc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1009 if (co == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1010 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1011 if (update_compiled_module(co, pathname) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1012 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1013 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1014 PySys_WriteStderr("import %s # precompiled from %s\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1015 name, cpathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1016 pathname = cpathname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1017 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1018 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1019 co = parse_source_module(pathname, fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1020 if (co == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1021 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1022 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1023 PySys_WriteStderr("import %s # from %s\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1024 name, pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1025 if (cpathname) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1026 PyObject *ro = PySys_GetObject("dont_write_bytecode");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1027 if (ro == NULL \|\| !PyObject_IsTrue(ro))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1028 write_compiled_module(co, cpathname, &st);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1029 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1030 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1031 m = PyImport_ExecCodeModuleEx(name, (PyObject *)co, pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1032 Py_DECREF(co);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1033
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1034 return m;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1035 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1036
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1037
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1038 /* Forward */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1039 static PyObject load_module(char , FILE , char , int, PyObject *);
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1040 static struct filedescr find_module(char , char , PyObject ,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1041 char , size_t, FILE , PyObject *);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	1042 static struct _frozen find_frozen(char name);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1043
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1044 /* Load a package and return its module object WITH INCREMENTED
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1045 REFERENCE COUNT */
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1046
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1047 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1048 load_package(char name, char pathname)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1049 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1050 PyObject m, d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1051 PyObject *file = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1052 PyObject *path = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1053 int err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1054 char buf[MAXPATHLEN+1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1055 FILE *fp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1056 struct filedescr *fdp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1057
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1058 m = PyImport_AddModule(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1059 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1060 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1061 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1062 PySys_WriteStderr("import %s # directory %s\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1063 name, pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1064 d = PyModule_GetDict(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1065 file = PyString_FromString(pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1066 if (file == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1067 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1068 path = Py_BuildValue("[O]", file);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1069 if (path == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1070 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1071 err = PyDict_SetItemString(d, "__file__", file);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1072 if (err == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1073 err = PyDict_SetItemString(d, "__path__", path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1074 if (err != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1075 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1076 buf[0] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1077 fdp = find_module(name, "__init__", path, buf, sizeof(buf), &fp, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1078 if (fdp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1079 if (PyErr_ExceptionMatches(PyExc_ImportError)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1080 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1081 Py_INCREF(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1082 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1083 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1084 m = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1085 goto cleanup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1086 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1087 m = load_module(name, fp, buf, fdp->type, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1088 if (fp != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1089 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1090 goto cleanup;
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	1091
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	1092 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1093 m = NULL;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1094 cleanup:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1095 Py_XDECREF(path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1096 Py_XDECREF(file);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1097 return m;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1098 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1099
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1100
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1101 /* Helper to test for built-in module */
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1102
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1103 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1104 is_builtin(char *name)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1105 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1106 int i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1107 for (i = 0; PyImport_Inittab[i].name != NULL; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1108 if (strcmp(name, PyImport_Inittab[i].name) == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1109 if (PyImport_Inittab[i].initfunc == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1110 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1111 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1112 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1113 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1114 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1115 return 0;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1116 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1117
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1118
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1119 /* Return an importer object for a sys.path/pkg.__path__ item 'p',
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1120 possibly by fetching it from the path_importer_cache dict. If it
39901 f90ba306c287 Very minor grammatical fix in a comment. Brett Cannon <bcannon@gmail.com> parents: 39827 diff changeset	1121 wasn't yet cached, traverse path_hooks until a hook is found
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1122 that can handle the path item. Return None if no hook could;
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1123 this tells our caller it should fall back to the builtin
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1124 import mechanism. Cache the result in path_importer_cache.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1125 Returns a borrowed reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1126
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1127 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1128 get_path_importer(PyObject path_importer_cache, PyObject path_hooks,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1129 PyObject *p)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1130 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1131 PyObject *importer;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1132 Py_ssize_t j, nhooks;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1133
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1134 /* These conditions are the caller's responsibility: */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1135 assert(PyList_Check(path_hooks));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1136 assert(PyDict_Check(path_importer_cache));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1137
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1138 nhooks = PyList_Size(path_hooks);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1139 if (nhooks < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1140 return NULL; /* Shouldn't happen */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1141
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1142 importer = PyDict_GetItem(path_importer_cache, p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1143 if (importer != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1144 return importer;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1145
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1146 /* set path_importer_cache[p] to None to avoid recursion */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1147 if (PyDict_SetItem(path_importer_cache, p, Py_None) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1148 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1149
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1150 for (j = 0; j < nhooks; j++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1151 PyObject *hook = PyList_GetItem(path_hooks, j);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1152 if (hook == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1153 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1154 importer = PyObject_CallFunctionObjArgs(hook, p, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1155 if (importer != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1156 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1157
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1158 if (!PyErr_ExceptionMatches(PyExc_ImportError)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1159 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1160 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1161 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1162 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1163 if (importer == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1164 importer = PyObject_CallFunctionObjArgs(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1165 (PyObject *)&PyNullImporter_Type, p, NULL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1166 );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1167 if (importer == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1168 if (PyErr_ExceptionMatches(PyExc_ImportError)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1169 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1170 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1171 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1172 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1173 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1174 if (importer != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1175 int err = PyDict_SetItem(path_importer_cache, p, importer);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1176 Py_DECREF(importer);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1177 if (err != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1178 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1179 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1180 return importer;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1181 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1182
43895 4cec0c6392c1 Patch #1739468: Directories and zipfiles containing __main__.py are now executable Nick Coghlan <ncoghlan@gmail.com> parents: 43792 diff changeset	1183 PyAPI_FUNC(PyObject *)
4cec0c6392c1 Patch #1739468: Directories and zipfiles containing __main__.py are now executable Nick Coghlan <ncoghlan@gmail.com> parents: 43792 diff changeset	1184 PyImport_GetImporter(PyObject *path) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1185 PyObject importer=NULL, path_importer_cache=NULL, *path_hooks=NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1186
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1187 if ((path_importer_cache = PySys_GetObject("path_importer_cache"))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1188 if ((path_hooks = PySys_GetObject("path_hooks"))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1189 importer = get_path_importer(path_importer_cache,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1190 path_hooks, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1191 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1192 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1193 Py_XINCREF(importer); /* get_path_importer returns a borrowed reference */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1194 return importer;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1195 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1196
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1197 /* Search the path (default sys.path) for a module. Return the
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1198 corresponding filedescr struct, and (via return arguments) the
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1199 pathname and an open file. Return NULL if the module is not found. */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1200
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1201 #ifdef MS_COREDLL
13663 29da35543833 ANSIfy as many declarations as possible. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	1202 extern FILE PyWin_FindRegisteredModule(const char , struct filedescr **,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1203 char *, Py_ssize_t);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1204 #endif
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1205
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1206 static int case_ok(char , Py_ssize_t, Py_ssize_t, char );
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	1207 static int find_init_module(char ); / Forward */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1208 static struct filedescr importhookdescr = {"", "", IMP_HOOK};
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1209
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1210 static struct filedescr *
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1211 find_module(char fullname, char subname, PyObject path, char buf,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1212 size_t buflen, FILE p_fp, PyObject p_loader)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1213 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1214 Py_ssize_t i, npath;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1215 size_t len, namelen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1216 struct filedescr *fdp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1217 char *filemode;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1218 FILE *fp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1219 PyObject path_hooks, path_importer_cache;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1220 static struct filedescr fd_frozen = {"", "", PY_FROZEN};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1221 static struct filedescr fd_builtin = {"", "", C_BUILTIN};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1222 static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1223 char name[MAXPATHLEN+1];
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1224 #if defined(PYOS_OS2)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1225 size_t saved_len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1226 size_t saved_namelen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1227 char *saved_buf = NULL;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1228 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1229 if (p_loader != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1230 *p_loader = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1231
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1232 if (strlen(subname) > MAXPATHLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1233 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1234 "module name is too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1235 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1236 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1237 strcpy(name, subname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1238
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1239 /* sys.meta_path import hook */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1240 if (p_loader != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1241 PyObject *meta_path;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1242
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1243 meta_path = PySys_GetObject("meta_path");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1244 if (meta_path == NULL \|\| !PyList_Check(meta_path)) {
72387 c9bb16b7d148 Fix the import machinery if there is an error on sys.path or sys.meta_path Victor Stinner <victor.stinner@haypocalc.com> parents: 72171 diff changeset	1245 PyErr_SetString(PyExc_RuntimeError,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1246 "sys.meta_path must be a list of "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1247 "import hooks");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1248 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1249 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1250 Py_INCREF(meta_path); /* zap guard */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1251 npath = PyList_Size(meta_path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1252 for (i = 0; i < npath; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1253 PyObject *loader;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1254 PyObject *hook = PyList_GetItem(meta_path, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1255 loader = PyObject_CallMethod(hook, "find_module",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1256 "sO", fullname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1257 path != NULL ?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1258 path : Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1259 if (loader == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1260 Py_DECREF(meta_path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1261 return NULL; /* true error */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1262 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1263 if (loader != Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1264 /* a loader was found */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1265 *p_loader = loader;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1266 Py_DECREF(meta_path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1267 return &importhookdescr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1268 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1269 Py_DECREF(loader);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1270 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1271 Py_DECREF(meta_path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1272 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1273
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1274 if (path != NULL && PyString_Check(path)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1275 /* The only type of submodule allowed inside a "frozen"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1276 package are other frozen modules or packages. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1277 if (PyString_Size(path) + 1 + strlen(name) >= (size_t)buflen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1278 PyErr_SetString(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1279 "full frozen module name too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1280 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1281 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1282 strcpy(buf, PyString_AsString(path));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1283 strcat(buf, ".");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1284 strcat(buf, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1285 strcpy(name, buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1286 if (find_frozen(name) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1287 strcpy(buf, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1288 return &fd_frozen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1289 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1290 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1291 "No frozen submodule named %.200s", name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1292 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1293 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1294 if (path == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1295 if (is_builtin(name)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1296 strcpy(buf, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1297 return &fd_builtin;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1298 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1299 if ((find_frozen(name)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1300 strcpy(buf, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1301 return &fd_frozen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1302 }
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	1303
4111 90216e907345 PYTHONWIN -> MS_COREDLL Guido van Rossum <guido@python.org> parents: 3964 diff changeset	1304 #ifdef MS_COREDLL
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1305 fp = PyWin_FindRegisteredModule(name, &fdp, buf, buflen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1306 if (fp != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1307 *p_fp = fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1308 return fdp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1309 }
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1310 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1311 path = PySys_GetObject("path");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1312 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1313 if (path == NULL \|\| !PyList_Check(path)) {
72387 c9bb16b7d148 Fix the import machinery if there is an error on sys.path or sys.meta_path Victor Stinner <victor.stinner@haypocalc.com> parents: 72171 diff changeset	1314 PyErr_SetString(PyExc_RuntimeError,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1315 "sys.path must be a list of directory names");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1316 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1317 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1318
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1319 path_hooks = PySys_GetObject("path_hooks");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1320 if (path_hooks == NULL \|\| !PyList_Check(path_hooks)) {
72387 c9bb16b7d148 Fix the import machinery if there is an error on sys.path or sys.meta_path Victor Stinner <victor.stinner@haypocalc.com> parents: 72171 diff changeset	1321 PyErr_SetString(PyExc_RuntimeError,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1322 "sys.path_hooks must be a list of "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1323 "import hooks");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1324 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1325 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1326 path_importer_cache = PySys_GetObject("path_importer_cache");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1327 if (path_importer_cache == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1328 !PyDict_Check(path_importer_cache)) {
72387 c9bb16b7d148 Fix the import machinery if there is an error on sys.path or sys.meta_path Victor Stinner <victor.stinner@haypocalc.com> parents: 72171 diff changeset	1329 PyErr_SetString(PyExc_RuntimeError,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1330 "sys.path_importer_cache must be a dict");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1331 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1332 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1333
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1334 npath = PyList_Size(path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1335 namelen = strlen(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1336 for (i = 0; i < npath; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1337 PyObject *copy = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1338 PyObject *v = PyList_GetItem(path, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1339 if (!v)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1340 return NULL;
23879 08475c87d24f Apply diff2.txt from SF patch http://www.python.org/sf/566999 Walter Dörwald <walter@livinglogic.de> parents: 23851 diff changeset	1341 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1342 if (PyUnicode_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1343 copy = PyUnicode_Encode(PyUnicode_AS_UNICODE(v),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1344 PyUnicode_GET_SIZE(v), Py_FileSystemDefaultEncoding, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1345 if (copy == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1346 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1347 v = copy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1348 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1349 else
23879 08475c87d24f Apply diff2.txt from SF patch http://www.python.org/sf/566999 Walter Dörwald <walter@livinglogic.de> parents: 23851 diff changeset	1350 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1351 if (!PyString_Check(v))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1352 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1353 len = PyString_GET_SIZE(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1354 if (len + 2 + namelen + MAXSUFFIXSIZE >= buflen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1355 Py_XDECREF(copy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1356 continue; /* Too long */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1357 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1358 strcpy(buf, PyString_AS_STRING(v));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1359 if (strlen(buf) != len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1360 Py_XDECREF(copy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1361 continue; /* v contains '\0' */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1362 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1363
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1364 /* sys.path_hooks import hook */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1365 if (p_loader != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1366 PyObject *importer;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1367
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1368 importer = get_path_importer(path_importer_cache,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1369 path_hooks, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1370 if (importer == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1371 Py_XDECREF(copy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1372 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1373 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1374 /* Note: importer is a borrowed reference */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1375 if (importer != Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1376 PyObject *loader;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1377 loader = PyObject_CallMethod(importer,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1378 "find_module",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1379 "s", fullname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1380 Py_XDECREF(copy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1381 if (loader == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1382 return NULL; /* error */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1383 if (loader != Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1384 /* a loader was found */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1385 *p_loader = loader;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1386 return &importhookdescr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1387 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1388 Py_DECREF(loader);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1389 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1390 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1391 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1392 /* no hook was found, use builtin import */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1393
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1394 if (len > 0 && buf[len-1] != SEP
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1395 #ifdef ALTSEP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1396 && buf[len-1] != ALTSEP
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1397 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1398 )
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1399 buf[len++] = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1400 strcpy(buf+len, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1401 len += namelen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1402
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1403 /* Check for package import (buf holds a directory name,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1404 and there's an __init__ module in that directory */
75490 2218a6cf75fc Moved directory detection into an isdir function Jason R. Coombs <jaraco@jaraco.com> parents: 74610 diff changeset	1405 if (isdir(buf) && /* it's an existing directory */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1406 case_ok(buf, len, namelen, name)) { /* case matches */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1407 if (find_init_module(buf)) { /* and has __init__.py */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1408 Py_XDECREF(copy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1409 return &fd_package;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1410 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1411 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1412 char warnstr[MAXPATHLEN+80];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1413 sprintf(warnstr, "Not importing directory "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1414 "'%.*s': missing __init__.py",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1415 MAXPATHLEN, buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1416 if (PyErr_Warn(PyExc_ImportWarning,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1417 warnstr)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1418 Py_XDECREF(copy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1419 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1420 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1421 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1422 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1423 #if defined(PYOS_OS2)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1424 /* take a snapshot of the module spec for restoration
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1425 * after the 8 character DLL hackery
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1426 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1427 saved_buf = strdup(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1428 saved_len = len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1429 saved_namelen = namelen;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1430 #endif /* PYOS_OS2 */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1431 for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
42736 ddefbdbdbcb5 Backport fix of #1752175. Georg Brandl <georg@python.org> parents: 41573 diff changeset	1432 #if defined(PYOS_OS2) && defined(HAVE_DYNAMIC_LOADING)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1433 /* OS/2 limits DLLs to 8 character names (w/o
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1434 extension)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1435 * so if the name is longer than that and its a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1436 * dynamically loaded module we're going to try,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1437 * truncate the name before trying
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1438 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1439 if (strlen(subname) > 8) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1440 /* is this an attempt to load a C extension? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1441 const struct filedescr *scan;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1442 scan = _PyImport_DynLoadFiletab;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1443 while (scan->suffix != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1444 if (!strcmp(scan->suffix, fdp->suffix))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1445 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1446 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1447 scan++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1448 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1449 if (scan->suffix != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1450 /* yes, so truncate the name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1451 namelen = 8;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1452 len -= strlen(subname) - namelen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1453 buf[len] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1454 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1455 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1456 #endif /* PYOS_OS2 */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1457 strcpy(buf+len, fdp->suffix);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1458 if (Py_VerboseFlag > 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1459 PySys_WriteStderr("# trying %s\n", buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1460 filemode = fdp->mode;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1461 if (filemode[0] == 'U')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1462 filemode = "r" PY_STDIOTEXTMODE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1463 fp = fopen(buf, filemode);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1464 if (fp != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1465 if (case_ok(buf, len, namelen, name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1466 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1467 else { /* continue search */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1468 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1469 fp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1470 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1471 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1472 #if defined(PYOS_OS2)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1473 /* restore the saved snapshot */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1474 strcpy(buf, saved_buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1475 len = saved_len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1476 namelen = saved_namelen;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1477 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1478 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1479 #if defined(PYOS_OS2)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1480 /* don't need/want the module name snapshot anymore */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1481 if (saved_buf)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1482 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1483 free(saved_buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1484 saved_buf = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1485 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1486 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1487 Py_XDECREF(copy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1488 if (fp != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1489 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1490 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1491 if (fp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1492 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1493 "No module named %.200s", name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1494 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1495 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1496 *p_fp = fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1497 return fdp;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1498 }
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	1499
33680 bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1500 /* Helpers for main.c
bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1501 * Find the source file corresponding to a named module
bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1502 */
bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1503 struct filedescr *
bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1504 _PyImport_FindModule(const char name, PyObject path, char *buf,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1505 size_t buflen, FILE p_fp, PyObject p_loader)
33680 bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1506 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1507 return find_module((char ) name, (char ) name, path,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1508 buf, buflen, p_fp, p_loader);
33680 bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1509 }
bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1510
bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1511 PyAPI_FUNC(int) _PyImport_IsScript(struct filedescr * fd)
bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1512 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1513 return fd->type == PY_SOURCE \|\| fd->type == PY_COMPILED;
33680 bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1514 }
bcafb68ad985 SF patch #1035498: -m option to run a module as a script Raymond Hettinger <python@rcn.com> parents: 33542 diff changeset	1515
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1516 /* case_ok(char* buf, Py_ssize_t len, Py_ssize_t namelen, char* name)
16902 f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1517 * The arguments here are tricky, best shown by example:
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1518 * /a/b/c/d/e/f/g/h/i/j/k/some_long_module_name.py\0
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1519 * ^ ^ ^ ^
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1520 * \|--------------------- buf ---------------------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1521 * \|------------------- len ------------------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1522 * \|------ name -------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1523 * \|----- namelen -----\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1524 * buf is the full path, but len only counts up to (& exclusive of) the
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1525 * extension. name is the module name, also exclusive of extension.
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1526 *
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1527 * We've already done a successful stat() or fopen() on buf, so know that
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1528 * there's some match, possibly case-insensitive.
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1529 *
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1530 * case_ok() is to return 1 if there's a case-sensitive match for
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1531 * name, else 0. case_ok() is also to return 1 if envar PYTHONCASEOK
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1532 * exists.
16902 f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1533 *
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1534 * case_ok() is used to implement case-sensitive import semantics even
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1535 * on platforms with case-insensitive filesystems. It's trivial to implement
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1536 * for case-sensitive filesystems. It's pretty much a cross-platform
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1537 * nightmare for systems with case-insensitive filesystems.
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1538 */
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1539
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1540 /* First we may need a pile of platform-specific header files; the sequence
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1541 * of #if's here should match the sequence in the body of case_ok().
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1542 */
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1543 #if defined(MS_WINDOWS)
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1544 #include <windows.h>
15802 eb1767b068fe SF Patch #103154 by jlt63: Cygwin Check Import Case Patch. Guido van Rossum <guido@python.org> parents: 15401 diff changeset	1545
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1546 #elif defined(DJGPP)
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1547 #include <dir.h>
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1548
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1549 #elif (defined(__MACH__) && defined(__APPLE__) \|\| defined(__CYGWIN__)) && defined(HAVE_DIRENT_H)
16880 bdcd79873924 In Steven's apparent absence, check in something with a non-zero chance Tim Peters <tim.peters@gmail.com> parents: 16830 diff changeset	1550 #include <sys/types.h>
bdcd79873924 In Steven's apparent absence, check in something with a non-zero chance Tim Peters <tim.peters@gmail.com> parents: 16830 diff changeset	1551 #include <dirent.h>
bdcd79873924 In Steven's apparent absence, check in something with a non-zero chance Tim Peters <tim.peters@gmail.com> parents: 16830 diff changeset	1552
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1553 #elif defined(PYOS_OS2)
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1554 #define INCL_DOS
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1555 #define INCL_DOSERRORS
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1556 #define INCL_NOPMAPI
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1557 #include <os2.h>
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1558
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20527 diff changeset	1559 #elif defined(RISCOS)
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20527 diff changeset	1560 #include "oslib/osfscontrol.h"
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1561 #endif
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1562
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1563 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1564 case_ok(char buf, Py_ssize_t len, Py_ssize_t namelen, char name)
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1565 {
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1566 /* Pick a platform-specific implementation; the sequence of #if's here should
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1567 * match the sequence just above.
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1568 */
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1569
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1570 /* MS_WINDOWS */
4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1571 #if defined(MS_WINDOWS)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1572 WIN32_FIND_DATA data;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1573 HANDLE h;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1574
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1575 if (Py_GETENV("PYTHONCASEOK") != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1576 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1577
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1578 h = FindFirstFile(buf, &data);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1579 if (h == INVALID_HANDLE_VALUE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1580 PyErr_Format(PyExc_NameError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1581 "Can't find file for module %.100s\n(filename %.300s)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1582 name, buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1583 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1584 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1585 FindClose(h);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1586 return strncmp(data.cFileName, name, namelen) == 0;
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1587
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1588 /* DJGPP */
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1589 #elif defined(DJGPP)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1590 struct ffblk ffblk;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1591 int done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1592
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1593 if (Py_GETENV("PYTHONCASEOK") != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1594 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1595
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1596 done = findfirst(buf, &ffblk, FA_ARCH\|FA_RDONLY\|FA_HIDDEN\|FA_DIREC);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1597 if (done) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1598 PyErr_Format(PyExc_NameError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1599 "Can't find file for module %.100s\n(filename %.300s)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1600 name, buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1601 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1602 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1603 return strncmp(ffblk.ff_name, name, namelen) == 0;
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1604
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1605 /* new-fangled macintosh (macosx) or Cygwin */
4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1606 #elif (defined(__MACH__) && defined(__APPLE__) \|\| defined(__CYGWIN__)) && defined(HAVE_DIRENT_H)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1607 DIR *dirp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1608 struct dirent *dp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1609 char dirname[MAXPATHLEN + 1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1610 const int dirlen = len - namelen - 1; /* don't want trailing SEP */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1611
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1612 if (Py_GETENV("PYTHONCASEOK") != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1613 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1614
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1615 /* Copy the dir component into dirname; substitute "." if empty */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1616 if (dirlen <= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1617 dirname[0] = '.';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1618 dirname[1] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1619 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1620 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1621 assert(dirlen <= MAXPATHLEN);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1622 memcpy(dirname, buf, dirlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1623 dirname[dirlen] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1624 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1625 /* Open the directory and search the entries for an exact match. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1626 dirp = opendir(dirname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1627 if (dirp) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1628 char *nameWithExt = buf + len - namelen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1629 while ((dp = readdir(dirp)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1630 const int thislen =
16880 bdcd79873924 In Steven's apparent absence, check in something with a non-zero chance Tim Peters <tim.peters@gmail.com> parents: 16830 diff changeset	1631 #ifdef _DIRENT_HAVE_D_NAMELEN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1632 dp->d_namlen;
16880 bdcd79873924 In Steven's apparent absence, check in something with a non-zero chance Tim Peters <tim.peters@gmail.com> parents: 16830 diff changeset	1633 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1634 strlen(dp->d_name);
16880 bdcd79873924 In Steven's apparent absence, check in something with a non-zero chance Tim Peters <tim.peters@gmail.com> parents: 16830 diff changeset	1635 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1636 if (thislen >= namelen &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1637 strcmp(dp->d_name, nameWithExt) == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1638 (void)closedir(dirp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1639 return 1; /* Found */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1640 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1641 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1642 (void)closedir(dirp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1643 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1644 return 0 ; /* Not found */
16880 bdcd79873924 In Steven's apparent absence, check in something with a non-zero chance Tim Peters <tim.peters@gmail.com> parents: 16830 diff changeset	1645
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20527 diff changeset	1646 /* RISC OS */
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20527 diff changeset	1647 #elif defined(RISCOS)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1648 char canon[MAXPATHLEN+1]; /* buffer for the canonical form of the path */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1649 char buf2[MAXPATHLEN+2];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1650 char *nameWithExt = buf+len-namelen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1651 int canonlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1652 os_error *e;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1653
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1654 if (Py_GETENV("PYTHONCASEOK") != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1655 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1656
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1657 /* workaround:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1658 append wildcard, otherwise case of filename wouldn't be touched */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1659 strcpy(buf2, buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1660 strcat(buf2, "*");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1661
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1662 e = xosfscontrol_canonicalise_path(buf2,canon,0,0,MAXPATHLEN+1,&canonlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1663 canonlen = MAXPATHLEN+1-canonlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1664 if (e \|\| canonlen<=0 \|\| canonlen>(MAXPATHLEN+1) )
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1665 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1666 if (strcmp(nameWithExt, canon+canonlen-strlen(nameWithExt))==0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1667 return 1; /* match */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1668
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1669 return 0;
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20527 diff changeset	1670
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1671 /* OS/2 */
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1672 #elif defined(PYOS_OS2)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1673 HDIR hdir = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1674 ULONG srchcnt = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1675 FILEFINDBUF3 ffbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1676 APIRET rc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1677
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1678 if (Py_GETENV("PYTHONCASEOK") != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1679 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1680
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1681 rc = DosFindFirst(buf,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1682 &hdir,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1683 FILE_READONLY \| FILE_HIDDEN \| FILE_SYSTEM \| FILE_DIRECTORY,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1684 &ffbuf, sizeof(ffbuf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1685 &srchcnt,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1686 FIL_STANDARD);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1687 if (rc != NO_ERROR)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1688 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1689 return strncmp(ffbuf.achName, name, namelen) == 0;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1690
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1691 /* assuming it's a case-sensitive filesystem, so there's nothing to do! */
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1692 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1693 return 1;
7305 067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	1694
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1695 #endif
7305 067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	1696 }
067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	1697
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1698
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1699 #ifdef HAVE_STAT
62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1700 /* Helper to look for __init__.py or __init__.py[co] in potential package */
62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1701 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1702 find_init_module(char *buf)
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1703 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1704 const size_t save_len = strlen(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1705 size_t i = save_len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1706 char pname; / pointer to start of __init__ */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1707 struct stat statbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1708
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1709 /* For calling case_ok(buf, len, namelen, name):
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1710 * /a/b/c/d/e/f/g/h/i/j/k/some_long_module_name.py\0
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1711 * ^ ^ ^ ^
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1712 * \|--------------------- buf ---------------------\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1713 * \|------------------- len ------------------\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1714 * \|------ name -------\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1715 * \|----- namelen -----\|
18388 06332b3c4335 SF bug #438295: [Windows] __init__.py cause strange behavior Tim Peters <tim.peters@gmail.com> parents: 17642 diff changeset	1716 */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1717 if (save_len + 13 >= MAXPATHLEN)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1718 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1719 buf[i++] = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1720 pname = buf + i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1721 strcpy(pname, "__init__.py");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1722 if (stat(buf, &statbuf) == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1723 if (case_ok(buf,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1724 save_len + 9, /* len("/__init__") */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1725 8, /* len("__init__") */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1726 pname)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1727 buf[save_len] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1728 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1729 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1730 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1731 i += strlen(pname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1732 strcpy(buf+i, Py_OptimizeFlag ? "o" : "c");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1733 if (stat(buf, &statbuf) == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1734 if (case_ok(buf,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1735 save_len + 9, /* len("/__init__") */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1736 8, /* len("__init__") */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1737 pname)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1738 buf[save_len] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1739 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1740 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1741 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1742 buf[save_len] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1743 return 0;
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1744 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1745
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1746 #else
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1747
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1748 #ifdef RISCOS
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1749 static int
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1750 find_init_module(buf)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1751 char *buf;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1752 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1753 int save_len = strlen(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1754 int i = save_len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1755
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1756 if (save_len + 13 >= MAXPATHLEN)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1757 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1758 buf[i++] = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1759 strcpy(buf+i, "__init__/py");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1760 if (isfile(buf)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1761 buf[save_len] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1762 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1763 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1764
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1765 if (Py_OptimizeFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1766 strcpy(buf+i, "o");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1767 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1768 strcpy(buf+i, "c");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1769 if (isfile(buf)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1770 buf[save_len] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1771 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1772 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1773 buf[save_len] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1774 return 0;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1775 }
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1776 #endif /RISCOS/
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1777
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1778 #endif /* HAVE_STAT */
62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1779
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	1780
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	1781 static int init_builtin(char ); / Forward */
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1782
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1783 /* Load an external module using the default search path and return
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	1784 its module object WITH INCREMENTED REFERENCE COUNT */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	1785
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1786 static PyObject *
55441 6c7b4b470827 Better name a variable: 'buf' seems to imply a mutable buffer. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 55141 diff changeset	1787 load_module(char name, FILE fp, char pathname, int type, PyObject loader)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	1788 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1789 PyObject *modules;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1790 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1791 int err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1792
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1793 /* First check that there's an open file (if we need one) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1794 switch (type) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1795 case PY_SOURCE:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1796 case PY_COMPILED:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1797 if (fp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1798 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1799 "file object required for import (type code %d)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1800 type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1801 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1802 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1803 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1804
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1805 switch (type) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1806
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1807 case PY_SOURCE:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61269 diff changeset	1808 m = load_source_module(name, pathname, fp);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1809 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1810
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1811 case PY_COMPILED:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61269 diff changeset	1812 m = load_compiled_module(name, pathname, fp);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1813 break;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1814
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	1815 #ifdef HAVE_DYNAMIC_LOADING
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1816 case C_EXTENSION:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61269 diff changeset	1817 m = _PyImport_LoadDynamicModule(name, pathname, fp);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1818 break;
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	1819 #endif
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1820
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1821 case PKG_DIRECTORY:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61269 diff changeset	1822 m = load_package(name, pathname);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1823 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1824
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1825 case C_BUILTIN:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1826 case PY_FROZEN:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61269 diff changeset	1827 if (pathname != NULL && pathname[0] != '\0')
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61269 diff changeset	1828 name = pathname;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1829 if (type == C_BUILTIN)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1830 err = init_builtin(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1831 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1832 err = PyImport_ImportFrozenModule(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1833 if (err < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1834 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1835 if (err == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1836 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1837 "Purported %s module %.200s not found",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1838 type == C_BUILTIN ?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1839 "builtin" : "frozen",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1840 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1841 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1842 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1843 modules = PyImport_GetModuleDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1844 m = PyDict_GetItemString(modules, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1845 if (m == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1846 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1847 PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1848 "%s module %.200s not properly initialized",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1849 type == C_BUILTIN ?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1850 "builtin" : "frozen",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1851 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1852 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1853 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1854 Py_INCREF(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1855 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1856
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1857 case IMP_HOOK: {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1858 if (loader == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1859 PyErr_SetString(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1860 "import hook without loader");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1861 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1862 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1863 m = PyObject_CallMethod(loader, "load_module", "s", name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1864 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1865 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1866
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1867 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1868 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1869 "Don't know how to import %.200s (type code %d)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1870 name, type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1871 m = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1872
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1873 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1874
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1875 return m;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1876 }
40 f28ac7f621c7 Added reload() functionality. Guido van Rossum <guido@python.org> parents: 6 diff changeset	1877
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	1878
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1879 /* Initialize a built-in module.
39978 47ab0c27dd1f Fix minor typo in a comment. Brett Cannon <bcannon@gmail.com> parents: 39901 diff changeset	1880 Return 1 for success, 0 if the module is not found, and -1 with
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1881 an exception set if the initialization failed. */
141 bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1882
bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1883 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1884 init_builtin(char *name)
141 bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1885 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1886 struct _inittab *p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1887
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1888 if (_PyImport_FindExtension(name, name) != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1889 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1890
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1891 for (p = PyImport_Inittab; p->name != NULL; p++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1892 if (strcmp(name, p->name) == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1893 if (p->initfunc == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1894 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1895 "Cannot re-init internal module %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1896 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1897 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1898 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1899 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1900 PySys_WriteStderr("import %s # builtin\n", name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1901 (*p->initfunc)();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1902 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1903 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1904 if (_PyImport_FixupExtension(name, name) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1905 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1906 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1907 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1908 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1909 return 0;
141 bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1910 }
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1911
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1912
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1913 /* Frozen modules */
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1914
3683 ec39264311ff struct frozen is now struct _frozen and comes from import.h. Guido van Rossum <guido@python.org> parents: 3590 diff changeset	1915 static struct _frozen *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1916 find_frozen(char *name)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1917 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1918 struct _frozen *p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1919
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1920 for (p = PyImport_FrozenModules; ; p++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1921 if (p->name == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1922 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1923 if (strcmp(p->name, name) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1924 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1925 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1926 return p;
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1927 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1928
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1929 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1930 get_frozen_object(char *name)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1931 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1932 struct _frozen *p = find_frozen(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1933 int size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1934
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1935 if (p == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1936 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1937 "No such frozen object named %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1938 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1939 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1940 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1941 if (p->code == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1942 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1943 "Excluded frozen object named %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1944 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1945 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1946 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1947 size = p->size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1948 if (size < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1949 size = -size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1950 return PyMarshal_ReadObjectFromString((char *)p->code, size);
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1951 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1952
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1953 /* Initialize a frozen module.
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1954 Return 1 for succes, 0 if the module is not found, and -1 with
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1955 an exception set if the initialization failed.
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1956 This function is also used from frozenmain.c */
2294 6263e2fd9398 init_frozen non-static, frozenmain.c not in Makefile any more Guido van Rossum <guido@python.org> parents: 2270 diff changeset	1957
6263e2fd9398 init_frozen non-static, frozenmain.c not in Makefile any more Guido van Rossum <guido@python.org> parents: 2270 diff changeset	1958 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1959 PyImport_ImportFrozenModule(char *name)
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1960 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1961 struct _frozen *p = find_frozen(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1962 PyObject *co;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1963 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1964 int ispackage;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1965 int size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1966
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1967 if (p == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1968 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1969 if (p->code == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1970 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1971 "Excluded frozen object named %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1972 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1973 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1974 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1975 size = p->size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1976 ispackage = (size < 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1977 if (ispackage)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1978 size = -size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1979 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1980 PySys_WriteStderr("import %s # frozen%s\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1981 name, ispackage ? " package" : "");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1982 co = PyMarshal_ReadObjectFromString((char *)p->code, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1983 if (co == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1984 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1985 if (!PyCode_Check(co)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1986 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1987 "frozen object %.200s is not a code object",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1988 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1989 goto err_return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1990 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1991 if (ispackage) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1992 /* Set __path__ to the package name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1993 PyObject d, s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1994 int err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1995 m = PyImport_AddModule(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1996 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1997 goto err_return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1998 d = PyModule_GetDict(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	1999 s = PyString_InternFromString(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2000 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2001 goto err_return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2002 err = PyDict_SetItemString(d, "__path__", s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2003 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2004 if (err != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2005 goto err_return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2006 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2007 m = PyImport_ExecCodeModuleEx(name, co, "<frozen>");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2008 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2009 goto err_return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2010 Py_DECREF(co);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2011 Py_DECREF(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2012 return 1;
39099 775f85b98e65 Fix memory leak under some conditions. Neal Norwitz <nnorwitz@gmail.com> parents: 39070 diff changeset	2013 err_return:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2014 Py_DECREF(co);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2015 return -1;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2016 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2017
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2018
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2019 /* Import a module, either built-in, frozen, or external, and return
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	2020 its module object WITH INCREMENTED REFERENCE COUNT */
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2021
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2022 PyObject *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35757 diff changeset	2023 PyImport_ImportModule(const char *name)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2024 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2025 PyObject *pname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2026 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2027
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2028 pname = PyString_FromString(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2029 if (pname == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2030 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2031 result = PyImport_Import(pname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2032 Py_DECREF(pname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2033 return result;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2034 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2035
44439 0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2036 /* Import a module without blocking
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2037 *
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2038 * At first it tries to fetch the module from sys.modules. If the module was
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2039 * never loaded before it loads it with PyImport_ImportModule() unless another
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2040 * thread holds the import lock. In the latter case the function raises an
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2041 * ImportError instead of blocking.
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2042 *
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2043 * Returns the module object with incremented ref count.
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2044 */
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2045 PyObject *
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2046 PyImport_ImportModuleNoBlock(const char *name)
0cbe94bea2c7 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0 Christian Heimes <christian@cheimes.de> parents: 44334 diff changeset	2047 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2048 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2049 PyObject *modules;
72171 85a12278de69 Remove unused variable if Python is build without threads Victor Stinner <victor.stinner@haypocalc.com> parents: 68256 diff changeset	2050 #ifdef WITH_THREAD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2051 long me;
72171 85a12278de69 Remove unused variable if Python is build without threads Victor Stinner <victor.stinner@haypocalc.com> parents: 68256 diff changeset	2052 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2053
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2054 /* Try to get the module from sys.modules[name] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2055 modules = PyImport_GetModuleDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2056 if (modules == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2057 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2058
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2059 result = PyDict_GetItemString(modules, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2060 if (result != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2061 Py_INCREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2062 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2063 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2064 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2065 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2066 }
48920 176c409fd747 Fix compilation when --without-threads is given #3683 Benjamin Peterson <benjamin@python.org> parents: 48189 diff changeset	2067 #ifdef WITH_THREAD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2068 /* check the import lock
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2069 * me might be -1 but I ignore the error here, the lock function
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2070 * takes care of the problem */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2071 me = PyThread_get_thread_ident();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2072 if (import_lock_thread == -1 \|\| import_lock_thread == me) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2073 /* no thread or me is holding the lock */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2074 return PyImport_ImportModule(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2075 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2076 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2077 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2078 "Failed to import %.200s because the import lock"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2079 "is held by another thread.",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2080 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2081 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2082 }
48920 176c409fd747 Fix compilation when --without-threads is given #3683 Benjamin Peterson <benjamin@python.org> parents: 48189 diff changeset	2083 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2084 return PyImport_ImportModule(name);
48920 176c409fd747 Fix compilation when --without-threads is given #3683 Benjamin Peterson <benjamin@python.org> parents: 48189 diff changeset	2085 #endif
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2086 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2087
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2088 /* Forward declarations for helper routines */
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2089 static PyObject get_parent(PyObject globals, char *buf,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2090 Py_ssize_t *p_buflen, int level);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	2091 static PyObject load_next(PyObject mod, PyObject *altmod,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2092 char *p_name, char buf, Py_ssize_t *p_buflen);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	2093 static int mark_miss(char *name);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	2094 static int ensure_fromlist(PyObject mod, PyObject fromlist,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2095 char *buf, Py_ssize_t buflen, int recursive);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	2096 static PyObject * import_submodule(PyObject mod, char name, char *fullname);
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2097
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2098 /* The Magnum Opus of dotted-name import :-) */
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2099
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	2100 static PyObject *
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2101 import_module_level(char name, PyObject globals, PyObject *locals,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2102 PyObject *fromlist, int level)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2103 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2104 char buf[MAXPATHLEN+1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2105 Py_ssize_t buflen = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2106 PyObject parent, head, next, tail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2107
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2108 if (strchr(name, '/') != NULL
44614 dc9d95b717c5 Fixed #1776. __import__() no longer imports modules by file name Christian Heimes <christian@cheimes.de> parents: 44569 diff changeset	2109 #ifdef MS_WINDOWS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2110 \|\| strchr(name, '\\') != NULL
44614 dc9d95b717c5 Fixed #1776. __import__() no longer imports modules by file name Christian Heimes <christian@cheimes.de> parents: 44569 diff changeset	2111 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2112 ) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2113 PyErr_SetString(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2114 "Import by filename is not supported.");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2115 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2116 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2117
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2118 parent = get_parent(globals, buf, &buflen, level);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2119 if (parent == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2120 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2121
61774 55e2368f72f2 Merged revisions 81380 via svnmerge from Brett Cannon <bcannon@gmail.com> parents: 61465 diff changeset	2122 head = load_next(parent, level < 0 ? Py_None : parent, &name, buf,
55e2368f72f2 Merged revisions 81380 via svnmerge from Brett Cannon <bcannon@gmail.com> parents: 61465 diff changeset	2123 &buflen);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2124 if (head == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2125 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2126
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2127 tail = head;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2128 Py_INCREF(tail);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2129 while (name) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2130 next = load_next(tail, tail, &name, buf, &buflen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2131 Py_DECREF(tail);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2132 if (next == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2133 Py_DECREF(head);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2134 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2135 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2136 tail = next;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2137 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2138 if (tail == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2139 /* If tail is Py_None, both get_parent and load_next found
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2140 an empty module name: someone called __import__("") or
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2141 doctored faulty bytecode */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2142 Py_DECREF(tail);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2143 Py_DECREF(head);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2144 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2145 "Empty module name");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2146 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2147 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2148
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2149 if (fromlist != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2150 if (fromlist == Py_None \|\| !PyObject_IsTrue(fromlist))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2151 fromlist = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2152 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2153
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2154 if (fromlist == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2155 Py_DECREF(tail);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2156 return head;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2157 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2158
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2159 Py_DECREF(head);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2160 if (!ensure_fromlist(tail, fromlist, buf, buflen, 0)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2161 Py_DECREF(tail);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2162 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2163 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2164
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2165 return tail;
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2166 }
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2167
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2168 PyObject *
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2169 PyImport_ImportModuleLevel(char name, PyObject globals, PyObject *locals,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2170 PyObject *fromlist, int level)
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2171 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2172 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2173 _PyImport_AcquireLock();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2174 result = import_module_level(name, globals, locals, fromlist, level);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2175 if (_PyImport_ReleaseLock() < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2176 Py_XDECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2177 PyErr_SetString(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2178 "not holding the import lock");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2179 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2180 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2181 return result;
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	2182 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	2183
32156 56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2184 /* Return the package that an import is being performed in. If globals comes
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2185 from the module foo.bar.bat (not itself a package), this returns the
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2186 sys.modules entry for foo.bar. If globals is from a package's __init__.py,
38471 9268c30782c0 Correct None refcount issue in Mac modules. (Are they Georg Brandl <georg@python.org> parents: 38465 diff changeset	2187 the package's entry in sys.modules is returned, as a borrowed reference.
32156 56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2188
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2189 The name of the returned package is returned in buf, with the length of
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2190 the name in *p_buflen.
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2191
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2192 If globals doesn't come from a package or a module in a package, or a
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2193 corresponding entry is not found in sys.modules, Py_None is returned.
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2194 */
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2195 static PyObject *
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2196 get_parent(PyObject globals, char buf, Py_ssize_t *p_buflen, int level)
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2197 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2198 static PyObject *namestr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2199 static PyObject *pathstr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2200 static PyObject *pkgstr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2201 PyObject pkgname, modname, modpath, modules, *parent;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2202 int orig_level = level;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2203
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2204 if (globals == NULL \|\| !PyDict_Check(globals) \|\| !level)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2205 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2206
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2207 if (namestr == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2208 namestr = PyString_InternFromString("__name__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2209 if (namestr == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2210 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2211 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2212 if (pathstr == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2213 pathstr = PyString_InternFromString("__path__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2214 if (pathstr == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2215 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2216 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2217 if (pkgstr == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2218 pkgstr = PyString_InternFromString("__package__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2219 if (pkgstr == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2220 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2221 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2222
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2223 *buf = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2224 *p_buflen = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2225 pkgname = PyDict_GetItem(globals, pkgstr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2226
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2227 if ((pkgname != NULL) && (pkgname != Py_None)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2228 /* __package__ is set, so use it */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2229 Py_ssize_t len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2230 if (!PyString_Check(pkgname)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2231 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2232 "__package__ set to non-string");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2233 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2234 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2235 len = PyString_GET_SIZE(pkgname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2236 if (len == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2237 if (level > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2238 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2239 "Attempted relative import in non-package");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2240 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2241 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2242 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2243 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2244 if (len > MAXPATHLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2245 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2246 "Package name too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2247 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2248 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2249 strcpy(buf, PyString_AS_STRING(pkgname));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2250 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2251 /* __package__ not set, so figure it out and set it */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2252 modname = PyDict_GetItem(globals, namestr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2253 if (modname == NULL \|\| !PyString_Check(modname))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2254 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2255
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2256 modpath = PyDict_GetItem(globals, pathstr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2257 if (modpath != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2258 /* __path__ is set, so modname is already the package name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2259 Py_ssize_t len = PyString_GET_SIZE(modname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2260 int error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2261 if (len > MAXPATHLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2262 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2263 "Module name too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2264 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2265 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2266 strcpy(buf, PyString_AS_STRING(modname));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2267 error = PyDict_SetItem(globals, pkgstr, modname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2268 if (error) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2269 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2270 "Could not set __package__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2271 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2272 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2273 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2274 /* Normal module, so work out the package name if any */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2275 char *start = PyString_AS_STRING(modname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2276 char *lastdot = strrchr(start, '.');
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2277 size_t len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2278 int error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2279 if (lastdot == NULL && level > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2280 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2281 "Attempted relative import in non-package");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2282 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2283 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2284 if (lastdot == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2285 error = PyDict_SetItem(globals, pkgstr, Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2286 if (error) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2287 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2288 "Could not set __package__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2289 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2290 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2291 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2292 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2293 len = lastdot - start;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2294 if (len >= MAXPATHLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2295 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2296 "Module name too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2297 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2298 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2299 strncpy(buf, start, len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2300 buf[len] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2301 pkgname = PyString_FromString(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2302 if (pkgname == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2303 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2304 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2305 error = PyDict_SetItem(globals, pkgstr, pkgname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2306 Py_DECREF(pkgname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2307 if (error) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2308 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2309 "Could not set __package__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2310 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2311 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2312 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2313 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2314 while (--level > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2315 char *dot = strrchr(buf, '.');
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2316 if (dot == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2317 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2318 "Attempted relative import beyond "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2319 "toplevel package");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2320 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2321 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2322 *dot = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2323 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2324 *p_buflen = strlen(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2325
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2326 modules = PyImport_GetModuleDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2327 parent = PyDict_GetItemString(modules, buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2328 if (parent == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2329 if (orig_level < 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2330 PyObject *err_msg = PyString_FromFormat(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2331 "Parent module '%.200s' not found "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2332 "while handling absolute import", buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2333 if (err_msg == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2334 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2335 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2336 if (!PyErr_WarnEx(PyExc_RuntimeWarning,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2337 PyString_AsString(err_msg), 1)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2338 *buf = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2339 *p_buflen = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2340 parent = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2341 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2342 Py_DECREF(err_msg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2343 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2344 PyErr_Format(PyExc_SystemError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2345 "Parent module '%.200s' not loaded, "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2346 "cannot perform relative import", buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2347 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2348 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2349 return parent;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2350 /* We expect, but can't guarantee, if parent != None, that:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2351 - parent.__name__ == buf
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2352 - parent.__dict__ is globals
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2353 If this is violated... Who cares? */
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2354 }
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2355
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2356 /* altmod is either None or same as mod */
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2357 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2358 load_next(PyObject mod, PyObject altmod, char *p_name, char buf,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2359 Py_ssize_t *p_buflen)
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2360 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2361 char name = p_name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2362 char *dot = strchr(name, '.');
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2363 size_t len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2364 char *p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2365 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2366
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2367 if (strlen(name) == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2368 /* completely empty module name should only happen in
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2369 'from . import' (or '__import__("")')*/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2370 Py_INCREF(mod);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2371 *p_name = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2372 return mod;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2373 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2374
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2375 if (dot == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2376 *p_name = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2377 len = strlen(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2378 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2379 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2380 *p_name = dot+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2381 len = dot-name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2382 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2383 if (len == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2384 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2385 "Empty module name");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2386 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2387 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2388
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2389 p = buf + *p_buflen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2390 if (p != buf)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2391 *p++ = '.';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2392 if (p+len-buf >= MAXPATHLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2393 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2394 "Module name too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2395 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2396 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2397 strncpy(p, name, len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2398 p[len] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2399 *p_buflen = p+len-buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2400
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2401 result = import_submodule(mod, p, buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2402 if (result == Py_None && altmod != mod) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2403 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2404 /* Here, altmod must be None and mod must not be None */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2405 result = import_submodule(altmod, p, p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2406 if (result != NULL && result != Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2407 if (mark_miss(buf) != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2408 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2409 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2410 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2411 strncpy(buf, name, len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2412 buf[len] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2413 *p_buflen = len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2414 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2415 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2416 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2417 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2418
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2419 if (result == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2420 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2421 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2422 "No module named %.200s", name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2423 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2424 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2425
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2426 return result;
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2427 }
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2428
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2429 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2430 mark_miss(char *name)
6252 6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	2431 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2432 PyObject *modules = PyImport_GetModuleDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2433 return PyDict_SetItemString(modules, name, Py_None);
6252 6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	2434 }
6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	2435
6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	2436 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	2437 ensure_fromlist(PyObject mod, PyObject fromlist, char *buf, Py_ssize_t buflen,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2438 int recursive)
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2439 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2440 int i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2441
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2442 if (!PyObject_HasAttrString(mod, "__path__"))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2443 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2444
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2445 for (i = 0; ; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2446 PyObject *item = PySequence_GetItem(fromlist, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2447 int hasit;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2448 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2449 if (PyErr_ExceptionMatches(PyExc_IndexError)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2450 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2451 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2452 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2453 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2454 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2455 if (!PyString_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2456 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2457 "Item in ``from list'' not a string");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2458 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2459 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2460 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2461 if (PyString_AS_STRING(item)[0] == '*') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2462 PyObject *all;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2463 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2464 /* See if the package defines __all__ */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2465 if (recursive)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2466 continue; /* Avoid endless recursion */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2467 all = PyObject_GetAttrString(mod, "__all__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2468 if (all == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2469 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2470 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2471 int ret = ensure_fromlist(mod, all, buf, buflen, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2472 Py_DECREF(all);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2473 if (!ret)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2474 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2475 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2476 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2477 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2478 hasit = PyObject_HasAttr(mod, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2479 if (!hasit) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2480 char *subname = PyString_AS_STRING(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2481 PyObject *submod;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2482 char *p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2483 if (buflen + strlen(subname) >= MAXPATHLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2484 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2485 "Module name too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2486 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2487 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2488 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2489 p = buf + buflen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2490 *p++ = '.';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2491 strcpy(p, subname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2492 submod = import_submodule(mod, subname, buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2493 Py_XDECREF(submod);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2494 if (submod == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2495 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2496 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2497 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2498 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2499 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2500 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2501
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2502 /* NOTREACHED */
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2503 }
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2504
29501 6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	2505 static int
6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	2506 add_submodule(PyObject mod, PyObject submod, char fullname, char subname,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2507 PyObject *modules)
29501 6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	2508 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2509 if (mod == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2510 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2511 /* Irrespective of the success of this load, make a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2512 reference to it in the parent package module. A copy gets
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2513 saved in the modules dictionary under the full name, so get a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2514 reference from there, if need be. (The exception is when the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2515 load failed with a SyntaxError -- then there's no trace in
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2516 sys.modules. In that case, of course, do nothing extra.) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2517 if (submod == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2518 submod = PyDict_GetItemString(modules, fullname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2519 if (submod == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2520 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2521 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2522 if (PyModule_Check(mod)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2523 /* We can't use setattr here since it can give a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2524 * spurious warning if the submodule name shadows a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2525 * builtin name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2526 PyObject *dict = PyModule_GetDict(mod);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2527 if (!dict)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2528 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2529 if (PyDict_SetItemString(dict, subname, submod) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2530 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2531 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2532 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2533 if (PyObject_SetAttrString(mod, subname, submod) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2534 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2535 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2536 return 1;
29501 6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	2537 }
6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	2538
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2539 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2540 import_submodule(PyObject mod, char subname, char *fullname)
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2541 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2542 PyObject *modules = PyImport_GetModuleDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2543 PyObject *m = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2544
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2545 /* Require:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2546 if mod == None: subname == fullname
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2547 else: mod.__name__ + "." + subname == fullname
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2548 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2549
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2550 if ((m = PyDict_GetItemString(modules, fullname)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2551 Py_INCREF(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2552 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2553 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2554 PyObject path, loader = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2555 char buf[MAXPATHLEN+1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2556 struct filedescr *fdp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2557 FILE *fp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2558
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2559 if (mod == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2560 path = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2561 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2562 path = PyObject_GetAttrString(mod, "__path__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2563 if (path == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2564 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2565 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2566 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2567 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2568 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2569
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2570 buf[0] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2571 fdp = find_module(fullname, subname, path, buf, MAXPATHLEN+1,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2572 &fp, &loader);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2573 Py_XDECREF(path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2574 if (fdp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2575 if (!PyErr_ExceptionMatches(PyExc_ImportError))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2576 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2577 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2578 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2579 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2580 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2581 m = load_module(fullname, fp, buf, fdp->type, loader);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2582 Py_XDECREF(loader);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2583 if (fp)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2584 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2585 if (!add_submodule(mod, m, fullname, subname, modules)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2586 Py_XDECREF(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2587 m = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2588 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2589 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2590
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2591 return m;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2592 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2593
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2594
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2595 /* Re-import a module of any kind and return its module object, WITH
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2596 INCREMENTED REFERENCE COUNT */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2597
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2598 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2599 PyImport_ReloadModule(PyObject *m)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2600 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2601 PyInterpreterState *interp = PyThreadState_Get()->interp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2602 PyObject *modules_reloading = interp->modules_reloading;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2603 PyObject *modules = PyImport_GetModuleDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2604 PyObject path = NULL, loader = NULL, *existing_m = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2605 char name, subname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2606 char buf[MAXPATHLEN+1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2607 struct filedescr *fdp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2608 FILE *fp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2609 PyObject *newm;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2610
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2611 if (modules_reloading == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2612 Py_FatalError("PyImport_ReloadModule: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2613 "no modules_reloading dictionary!");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2614 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2615 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2616
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2617 if (m == NULL \|\| !PyModule_Check(m)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2618 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2619 "reload() argument must be module");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2620 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2621 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2622 name = PyModule_GetName(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2623 if (name == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2624 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2625 if (m != PyDict_GetItemString(modules, name)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2626 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2627 "reload(): module %.200s not in sys.modules",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2628 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2629 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2630 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2631 existing_m = PyDict_GetItemString(modules_reloading, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2632 if (existing_m != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2633 /* Due to a recursive reload, this module is already
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2634 being reloaded. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2635 Py_INCREF(existing_m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2636 return existing_m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2637 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2638 if (PyDict_SetItemString(modules_reloading, name, m) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2639 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2640
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2641 subname = strrchr(name, '.');
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2642 if (subname == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2643 subname = name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2644 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2645 PyObject parentname, parent;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2646 parentname = PyString_FromStringAndSize(name, (subname-name));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2647 if (parentname == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2648 imp_modules_reloading_clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2649 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2650 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2651 parent = PyDict_GetItem(modules, parentname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2652 if (parent == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2653 PyErr_Format(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2654 "reload(): parent %.200s not in sys.modules",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2655 PyString_AS_STRING(parentname));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2656 Py_DECREF(parentname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2657 imp_modules_reloading_clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2658 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2659 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2660 Py_DECREF(parentname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2661 subname++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2662 path = PyObject_GetAttrString(parent, "__path__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2663 if (path == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2664 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2665 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2666 buf[0] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2667 fdp = find_module(name, subname, path, buf, MAXPATHLEN+1, &fp, &loader);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2668 Py_XDECREF(path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2669
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2670 if (fdp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2671 Py_XDECREF(loader);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2672 imp_modules_reloading_clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2673 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2674 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2675
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2676 newm = load_module(name, fp, buf, fdp->type, loader);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2677 Py_XDECREF(loader);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2678
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2679 if (fp)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2680 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2681 if (newm == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2682 /* load_module probably removed name from modules because of
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2683 * the error. Put back the original module object. We're
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2684 * going to return NULL in this case regardless of whether
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2685 * replacing name succeeds, so the return value is ignored.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2686 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2687 PyDict_SetItemString(modules, name, m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2688 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2689 imp_modules_reloading_clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2690 return newm;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2691 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2692
d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2693
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2694 /* Higher-level import emulator which emulates the "import" statement
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2695 more accurately -- it invokes the __import__() function from the
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2696 builtins of the current globals. This means that the import is
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2697 done using whatever import hooks are installed in the current
9680 8b61e1273b4b Improve comment for PyImport_Import() as suggested by Bill Tutt. Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2698 environment, e.g. by "rexec".
8b61e1273b4b Improve comment for PyImport_Import() as suggested by Bill Tutt. Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2699 A dummy list ["__doc__"] is passed as the 4th argument so that
8b61e1273b4b Improve comment for PyImport_Import() as suggested by Bill Tutt. Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2700 e.g. PyImport_Import(PyString_FromString("win32com.client.gencache"))
8b61e1273b4b Improve comment for PyImport_Import() as suggested by Bill Tutt. Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2701 will return <module "gencache"> instead of <module "win32com">. */
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2702
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2703 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2704 PyImport_Import(PyObject *module_name)
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2705 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2706 static PyObject *silly_list = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2707 static PyObject *builtins_str = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2708 static PyObject *import_str = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2709 PyObject *globals = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2710 PyObject *import = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2711 PyObject *builtins = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2712 PyObject *r = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2713
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2714 /* Initialize constant string objects */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2715 if (silly_list == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2716 import_str = PyString_InternFromString("__import__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2717 if (import_str == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2718 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2719 builtins_str = PyString_InternFromString("__builtins__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2720 if (builtins_str == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2721 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2722 silly_list = Py_BuildValue("[s]", "__doc__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2723 if (silly_list == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2724 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2725 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2726
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2727 /* Get the builtins from current globals */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2728 globals = PyEval_GetGlobals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2729 if (globals != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2730 Py_INCREF(globals);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2731 builtins = PyObject_GetItem(globals, builtins_str);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2732 if (builtins == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2733 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2734 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2735 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2736 /* No globals -- use standard builtins, and fake globals */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2737 builtins = PyImport_ImportModuleLevel("__builtin__",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2738 NULL, NULL, NULL, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2739 if (builtins == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2740 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2741 globals = Py_BuildValue("{OO}", builtins_str, builtins);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2742 if (globals == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2743 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2744 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2745
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2746 /* Get the __import__ function from the builtins */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2747 if (PyDict_Check(builtins)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2748 import = PyObject_GetItem(builtins, import_str);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2749 if (import == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2750 PyErr_SetObject(PyExc_KeyError, import_str);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2751 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2752 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2753 import = PyObject_GetAttr(builtins, import_str);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2754 if (import == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2755 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2756
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2757 /* Call the __import__ function with the proper argument list
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2758 * Always use absolute import here. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2759 r = PyObject_CallFunction(import, "OOOOi", module_name, globals,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2760 globals, silly_list, 0, NULL);
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2761
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2762 err:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2763 Py_XDECREF(globals);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2764 Py_XDECREF(builtins);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2765 Py_XDECREF(import);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2766
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2767 return r;
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2768 }
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2769
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2770
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2771 /* Module 'imp' provides Python access to the primitives used for
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2772 importing modules.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2773 */
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2774
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2775 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	2776 imp_get_magic(PyObject self, PyObject noargs)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2777 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2778 char buf[4];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2779
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2780 buf[0] = (char) ((pyc_magic >> 0) & 0xff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2781 buf[1] = (char) ((pyc_magic >> 8) & 0xff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2782 buf[2] = (char) ((pyc_magic >> 16) & 0xff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2783 buf[3] = (char) ((pyc_magic >> 24) & 0xff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2784
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2785 return PyString_FromStringAndSize(buf, 4);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2786 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2787
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2788 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	2789 imp_get_suffixes(PyObject self, PyObject noargs)
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2790 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2791 PyObject *list;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2792 struct filedescr *fdp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2793
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2794 list = PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2795 if (list == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2796 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2797 for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2798 PyObject *item = Py_BuildValue("ssi",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2799 fdp->suffix, fdp->mode, fdp->type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2800 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2801 Py_DECREF(list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2802 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2803 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2804 if (PyList_Append(list, item) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2805 Py_DECREF(list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2806 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2807 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2808 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2809 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2810 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2811 return list;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2812 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2813
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2814 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2815 call_find_module(char name, PyObject path)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2816 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2817 extern int fclose(FILE *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2818 PyObject fob, ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2819 struct filedescr *fdp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2820 char pathname[MAXPATHLEN+1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2821 FILE *fp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2822
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2823 pathname[0] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2824 if (path == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2825 path = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2826 fdp = find_module(NULL, name, path, pathname, MAXPATHLEN+1, &fp, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2827 if (fdp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2828 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2829 if (fp != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2830 fob = PyFile_FromFile(fp, pathname, fdp->mode, fclose);
72456 0f5b64630fda Issue #7732: Fix a crash on importing a module if a directory has the same name Victor Stinner <victor.stinner@haypocalc.com> parents: 72387 diff changeset	2831 if (fob == NULL)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2832 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2833 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2834 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2835 fob = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2836 Py_INCREF(fob);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2837 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2838 ret = Py_BuildValue("Os(ssi)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2839 fob, pathname, fdp->suffix, fdp->mode, fdp->type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2840 Py_DECREF(fob);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2841 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2842 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2843
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2844 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2845 imp_find_module(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2846 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2847 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2848 PyObject *path = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2849 if (!PyArg_ParseTuple(args, "s\|O:find_module", &name, &path))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2850 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2851 return call_find_module(name, path);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2852 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2853
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2854 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2855 imp_init_builtin(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2856 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2857 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2858 int ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2859 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2860 if (!PyArg_ParseTuple(args, "s:init_builtin", &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2861 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2862 ret = init_builtin(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2863 if (ret < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2864 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2865 if (ret == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2866 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2867 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2868 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2869 m = PyImport_AddModule(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2870 Py_XINCREF(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2871 return m;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2872 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2873
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2874 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2875 imp_init_frozen(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2876 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2877 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2878 int ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2879 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2880 if (!PyArg_ParseTuple(args, "s:init_frozen", &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2881 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2882 ret = PyImport_ImportFrozenModule(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2883 if (ret < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2884 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2885 if (ret == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2886 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2887 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2888 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2889 m = PyImport_AddModule(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2890 Py_XINCREF(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2891 return m;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2892 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2893
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2894 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2895 imp_get_frozen_object(PyObject self, PyObject args)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2896 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2897 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2898
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2899 if (!PyArg_ParseTuple(args, "s:get_frozen_object", &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2900 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2901 return get_frozen_object(name);
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2902 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2903
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2904 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2905 imp_is_builtin(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2906 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2907 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2908 if (!PyArg_ParseTuple(args, "s:is_builtin", &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2909 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2910 return PyInt_FromLong(is_builtin(name));
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2911 }
d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2912
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2913 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2914 imp_is_frozen(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2915 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2916 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2917 struct _frozen *p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2918 if (!PyArg_ParseTuple(args, "s:is_frozen", &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2919 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2920 p = find_frozen(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2921 return PyBool_FromLong((long) (p == NULL ? 0 : p->size));
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2922 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2923
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2924 static FILE *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2925 get_file(char pathname, PyObject fob, char *mode)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2926 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2927 FILE *fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2928 if (fob == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2929 if (mode[0] == 'U')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2930 mode = "r" PY_STDIOTEXTMODE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2931 fp = fopen(pathname, mode);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2932 if (fp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2933 PyErr_SetFromErrno(PyExc_IOError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2934 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2935 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2936 fp = PyFile_AsFile(fob);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2937 if (fp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2938 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2939 "bad/closed file object");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2940 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2941 return fp;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2942 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2943
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2944 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2945 imp_load_compiled(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2946 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2947 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2948 char *pathname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2949 PyObject *fob = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2950 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2951 FILE *fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2952 if (!PyArg_ParseTuple(args, "ss\|O!:load_compiled", &name, &pathname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2953 &PyFile_Type, &fob))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2954 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2955 fp = get_file(pathname, fob, "rb");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2956 if (fp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2957 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2958 m = load_compiled_module(name, pathname, fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2959 if (fob == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2960 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2961 return m;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2962 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2963
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2964 #ifdef HAVE_DYNAMIC_LOADING
528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2965
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2966 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2967 imp_load_dynamic(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2968 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2969 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2970 char *pathname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2971 PyObject *fob = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2972 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2973 FILE *fp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2974 if (!PyArg_ParseTuple(args, "ss\|O!:load_dynamic", &name, &pathname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2975 &PyFile_Type, &fob))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2976 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2977 if (fob) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2978 fp = get_file(pathname, fob, "r");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2979 if (fp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2980 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2981 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2982 m = _PyImport_LoadDynamicModule(name, pathname, fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2983 return m;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2984 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2985
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2986 #endif /* HAVE_DYNAMIC_LOADING */
528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2987
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2988 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2989 imp_load_source(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2990 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2991 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2992 char *pathname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2993 PyObject *fob = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2994 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2995 FILE *fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2996 if (!PyArg_ParseTuple(args, "ss\|O!:load_source", &name, &pathname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2997 &PyFile_Type, &fob))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2998 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	2999 fp = get_file(pathname, fob, "r");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3000 if (fp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3001 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3002 m = load_source_module(name, pathname, fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3003 if (fob == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3004 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3005 return m;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3006 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3007
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3008 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3009 imp_load_module(PyObject self, PyObject args)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3010 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3011 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3012 PyObject *fob;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3013 char *pathname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3014 char suffix; / Unused */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3015 char *mode;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3016 int type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3017 FILE *fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3018
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3019 if (!PyArg_ParseTuple(args, "sOs(ssi):load_module",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3020 &name, &fob, &pathname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3021 &suffix, &mode, &type))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3022 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3023 if (*mode) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3024 /* Mode must start with 'r' or 'U' and must not contain '+'.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3025 Implicit in this test is the assumption that the mode
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3026 may contain other modifiers like 'b' or 't'. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3027
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3028 if (!(mode == 'r' \|\| mode == 'U') \|\| strchr(mode, '+')) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3029 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3030 "invalid file open mode %.200s", mode);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3031 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3032 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3033 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3034 if (fob == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3035 fp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3036 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3037 if (!PyFile_Check(fob)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3038 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3039 "load_module arg#2 should be a file or None");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3040 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3041 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3042 fp = get_file(pathname, fob, mode);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3043 if (fp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3044 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3045 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3046 return load_module(name, fp, pathname, type, NULL);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3047 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3048
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3049 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3050 imp_load_package(PyObject self, PyObject args)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3051 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3052 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3053 char *pathname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3054 if (!PyArg_ParseTuple(args, "ss:load_package", &name, &pathname))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3055 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3056 return load_package(name, pathname);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3057 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3058
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3059 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3060 imp_new_module(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3061 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3062 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3063 if (!PyArg_ParseTuple(args, "s:new_module", &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3064 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3065 return PyModule_New(name);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3066 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3067
48189 53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3068 static PyObject *
53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3069 imp_reload(PyObject self, PyObject v)
53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3070 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3071 return PyImport_ReloadModule(v);
48189 53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3072 }
53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3073
53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3074
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3075 /* Doc strings */
6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3076
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3077 PyDoc_STRVAR(doc_imp,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3078 "This module provides the components needed to build your own\n\
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3079 __import__ function. Undocumented functions are obsolete.");
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3080
48189 53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3081 PyDoc_STRVAR(doc_reload,
53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3082 "reload(module) -> module\n\
53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3083 \n\
53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3084 Reload the module. The module must have been successfully imported before.");
53ade9e68b56 Add imp.reload(). This to help with transitioning to 3.0 the reload() built-in Brett Cannon <bcannon@gmail.com> parents: 47944 diff changeset	3085
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3086 PyDoc_STRVAR(doc_find_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3087 "find_module(name, [path]) -> (file, filename, (suffix, mode, type))\n\
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3088 Search for a module. If path is omitted or None, search for a\n\
6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3089 built-in, frozen or special module and continue search in sys.path.\n\
6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3090 The module name cannot contain '.'; to search for a submodule of a\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3091 package, pass the submodule name and the package's __path__.");
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3092
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3093 PyDoc_STRVAR(doc_load_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3094 "load_module(name, file, filename, (suffix, mode, type)) -> module\n\
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3095 Load a module, given information returned by find_module().\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3096 The module name must include the full package name, if any.");
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3097
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3098 PyDoc_STRVAR(doc_get_magic,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3099 "get_magic() -> string\n\
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3100 Return the magic number for .pyc or .pyo files.");
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3101
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3102 PyDoc_STRVAR(doc_get_suffixes,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3103 "get_suffixes() -> [(suffix, mode, type), ...]\n\
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3104 Return a list of (suffix, mode, type) tuples describing the files\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3105 that find_module() looks for.");
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3106
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3107 PyDoc_STRVAR(doc_new_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3108 "new_module(name) -> module\n\
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3109 Create a new module. Do not enter it in sys.modules.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3110 The module name must include the full package name, if any.");
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3111
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3112 PyDoc_STRVAR(doc_lock_held,
32879 d3d609d657fd lock_held() docs: Use True/False instead of 1/0. The LaTeX docs were Tim Peters <tim.peters@gmail.com> parents: 32878 diff changeset	3113 "lock_held() -> boolean\n\
d3d609d657fd lock_held() docs: Use True/False instead of 1/0. The LaTeX docs were Tim Peters <tim.peters@gmail.com> parents: 32878 diff changeset	3114 Return True if the import lock is currently held, else False.\n\
d3d609d657fd lock_held() docs: Use True/False instead of 1/0. The LaTeX docs were Tim Peters <tim.peters@gmail.com> parents: 32878 diff changeset	3115 On platforms without threads, return False.");
19596 1be18ef869a4 Add a new function imp.lock_held(), and use it to skip test_threaded_import Tim Peters <tim.peters@gmail.com> parents: 19238 diff changeset	3116
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3117 PyDoc_STRVAR(doc_acquire_lock,
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3118 "acquire_lock() -> None\n\
27853 5620b0786271 Cleanup from patch #683257: Neal Norwitz <nnorwitz@gmail.com> parents: 27852 diff changeset	3119 Acquires the interpreter's import lock for the current thread.\n\
5620b0786271 Cleanup from patch #683257: Neal Norwitz <nnorwitz@gmail.com> parents: 27852 diff changeset	3120 This lock should be used by import hooks to ensure thread-safety\n\
5620b0786271 Cleanup from patch #683257: Neal Norwitz <nnorwitz@gmail.com> parents: 27852 diff changeset	3121 when importing modules.\n\
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3122 On platforms without threads, this function does nothing.");
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3123
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3124 PyDoc_STRVAR(doc_release_lock,
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3125 "release_lock() -> None\n\
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3126 Release the interpreter's import lock.\n\
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3127 On platforms without threads, this function does nothing.");
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3128
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3129 static PyMethodDef imp_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3130 {"reload", imp_reload, METH_O, doc_reload},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3131 {"find_module", imp_find_module, METH_VARARGS, doc_find_module},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3132 {"get_magic", imp_get_magic, METH_NOARGS, doc_get_magic},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3133 {"get_suffixes", imp_get_suffixes, METH_NOARGS, doc_get_suffixes},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3134 {"load_module", imp_load_module, METH_VARARGS, doc_load_module},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3135 {"new_module", imp_new_module, METH_VARARGS, doc_new_module},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3136 {"lock_held", imp_lock_held, METH_NOARGS, doc_lock_held},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3137 {"acquire_lock", imp_acquire_lock, METH_NOARGS, doc_acquire_lock},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3138 {"release_lock", imp_release_lock, METH_NOARGS, doc_release_lock},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3139 /* The rest are obsolete */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3140 {"get_frozen_object", imp_get_frozen_object, METH_VARARGS},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3141 {"init_builtin", imp_init_builtin, METH_VARARGS},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3142 {"init_frozen", imp_init_frozen, METH_VARARGS},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3143 {"is_builtin", imp_is_builtin, METH_VARARGS},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3144 {"is_frozen", imp_is_frozen, METH_VARARGS},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3145 {"load_compiled", imp_load_compiled, METH_VARARGS},
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3146 #ifdef HAVE_DYNAMIC_LOADING
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3147 {"load_dynamic", imp_load_dynamic, METH_VARARGS},
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3148 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3149 {"load_package", imp_load_package, METH_VARARGS},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3150 {"load_source", imp_load_source, METH_VARARGS},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3151 {NULL, NULL} /* sentinel */
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3152 };
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3153
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8613 diff changeset	3154 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3155 setint(PyObject d, char name, int value)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3156 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3157 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3158 int err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3159
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3160 v = PyInt_FromLong((long)value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3161 err = PyDict_SetItemString(d, name, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3162 Py_XDECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3163 return err;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3164 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3165
39253 3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3166 typedef struct {
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3167 PyObject_HEAD
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3168 } NullImporter;
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3169
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3170 static int
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3171 NullImporter_init(NullImporter self, PyObject args, PyObject *kwds)
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3172 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3173 char *path;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3174 Py_ssize_t pathlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3175
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3176 if (!_PyArg_NoKeywords("NullImporter()", kwds))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3177 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3178
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3179 if (!PyArg_ParseTuple(args, "s:NullImporter",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3180 &path))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3181 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3182
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3183 pathlen = strlen(path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3184 if (pathlen == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3185 PyErr_SetString(PyExc_ImportError, "empty pathname");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3186 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3187 } else {
39253 3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3188 #ifndef RISCOS
50786 2d453b221bec Merged revisions 68292,68344,68361,68378,68424,68426,68429-68430,68450,68457,68480-68481,68493,68495,68499,68501,68512,68514-68515 via svnmerge from Georg Brandl <georg@python.org> parents: 50618 diff changeset	3189 #ifndef MS_WINDOWS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3190 struct stat statbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3191 int rv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3192
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3193 rv = stat(path, &statbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3194 if (rv == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3195 /* it exists */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3196 if (S_ISDIR(statbuf.st_mode)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3197 /* it's a directory */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3198 PyErr_SetString(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3199 "existing directory");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3200 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3201 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3202 }
50786 2d453b221bec Merged revisions 68292,68344,68361,68378,68424,68426,68429-68430,68450,68457,68480-68481,68493,68495,68499,68501,68512,68514-68515 via svnmerge from Georg Brandl <georg@python.org> parents: 50618 diff changeset	3203 #else /* MS_WINDOWS */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3204 DWORD rv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3205 /* see issue1293 and issue3677:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3206 * stat() on Windows doesn't recognise paths like
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3207 * "e:\\shared\\" and "\\\\whiterab-c2znlh\\shared" as dirs.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3208 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3209 rv = GetFileAttributesA(path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3210 if (rv != INVALID_FILE_ATTRIBUTES) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3211 /* it exists */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3212 if (rv & FILE_ATTRIBUTE_DIRECTORY) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3213 /* it's a directory */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3214 PyErr_SetString(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3215 "existing directory");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3216 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3217 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3218 }
39253 3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3219 #endif
50786 2d453b221bec Merged revisions 68292,68344,68361,68378,68424,68426,68429-68430,68450,68457,68480-68481,68493,68495,68499,68501,68512,68514-68515 via svnmerge from Georg Brandl <georg@python.org> parents: 50618 diff changeset	3220 #else /* RISCOS */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3221 if (object_exists(path)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3222 /* it exists */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3223 if (isdir(path)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3224 /* it's a directory */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3225 PyErr_SetString(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3226 "existing directory");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3227 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3228 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3229 }
39253 3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3230 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3231 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3232 return 0;
39253 3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3233 }
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3234
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3235 static PyObject *
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3236 NullImporter_find_module(NullImporter self, PyObject args)
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3237 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3238 Py_RETURN_NONE;
39253 3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3239 }
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3240
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3241 static PyMethodDef NullImporter_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3242 {"find_module", (PyCFunction)NullImporter_find_module, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3243 "Always return None"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3244 },
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3245 {NULL} /* Sentinel */
39253 3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3246 };
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3247
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3248
43895 4cec0c6392c1 Patch #1739468: Directories and zipfiles containing __main__.py are now executable Nick Coghlan <ncoghlan@gmail.com> parents: 43792 diff changeset	3249 PyTypeObject PyNullImporter_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3250 PyVarObject_HEAD_INIT(NULL, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3251 "imp.NullImporter", /tp_name/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3252 sizeof(NullImporter), /tp_basicsize/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3253 0, /tp_itemsize/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3254 0, /tp_dealloc/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3255 0, /tp_print/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3256 0, /tp_getattr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3257 0, /tp_setattr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3258 0, /tp_compare/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3259 0, /tp_repr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3260 0, /tp_as_number/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3261 0, /tp_as_sequence/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3262 0, /tp_as_mapping/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3263 0, /tp_hash /
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3264 0, /tp_call/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3265 0, /tp_str/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3266 0, /tp_getattro/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3267 0, /tp_setattro/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3268 0, /tp_as_buffer/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3269 Py_TPFLAGS_DEFAULT, /tp_flags/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3270 "Null importer object", /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3271 0, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3272 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3273 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3274 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3275 0, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3276 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3277 NullImporter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3278 0, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3279 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3280 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3281 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3282 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3283 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3284 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3285 (initproc)NullImporter_init, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3286 0, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3287 PyType_GenericNew /* tp_new */
39253 3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3288 };
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3289
3f4485b20e79 Bug #1529871: The speed enhancement patch #921466 broke Python's compliance Phillip J. Eby <pje@telecommunity.com> parents: 39130 diff changeset	3290
30311 f003e48f562d Bug #794140: cygwin builds do not embed Jason Tishler <jason@tishler.net> parents: 29812 diff changeset	3291 PyMODINIT_FUNC
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3292 initimp(void)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3293 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3294 PyObject m, d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3295
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3296 if (PyType_Ready(&PyNullImporter_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3297 goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3298
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3299 m = Py_InitModule4("imp", imp_methods, doc_imp,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3300 NULL, PYTHON_API_VERSION);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3301 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3302 goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3303 d = PyModule_GetDict(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3304 if (d == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3305 goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3306
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3307 if (setint(d, "SEARCH_ERROR", SEARCH_ERROR) < 0) goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3308 if (setint(d, "PY_SOURCE", PY_SOURCE) < 0) goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3309 if (setint(d, "PY_COMPILED", PY_COMPILED) < 0) goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3310 if (setint(d, "C_EXTENSION", C_EXTENSION) < 0) goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3311 if (setint(d, "PY_RESOURCE", PY_RESOURCE) < 0) goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3312 if (setint(d, "PKG_DIRECTORY", PKG_DIRECTORY) < 0) goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3313 if (setint(d, "C_BUILTIN", C_BUILTIN) < 0) goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3314 if (setint(d, "PY_FROZEN", PY_FROZEN) < 0) goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3315 if (setint(d, "PY_CODERESOURCE", PY_CODERESOURCE) < 0) goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3316 if (setint(d, "IMP_HOOK", IMP_HOOK) < 0) goto failure;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3317
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3318 Py_INCREF(&PyNullImporter_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3319 PyModule_AddObject(m, "NullImporter", (PyObject *)&PyNullImporter_Type);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3320 failure:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3321 ;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3322 }
8330 7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3323
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3324
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12543 diff changeset	3325 /* API for embedding applications that want to add their own entries
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12543 diff changeset	3326 to the table of built-in modules. This should normally be called
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12543 diff changeset	3327 before Py_Initialize(). When the table resize fails, -1 is
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12543 diff changeset	3328 returned and the existing table is unchanged.
8330 7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3329
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3330 After a similar function by Just van Rossum. */
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3331
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3332 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3333 PyImport_ExtendInittab(struct _inittab *newtab)
8330 7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3334 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3335 static struct _inittab *our_copy = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3336 struct _inittab *p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3337 int i, n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3338
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3339 /* Count the number of entries in both tables */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3340 for (n = 0; newtab[n].name != NULL; n++)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3341 ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3342 if (n == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3343 return 0; /* Nothing to do */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3344 for (i = 0; PyImport_Inittab[i].name != NULL; i++)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3345 ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3346
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3347 /* Allocate new memory for the combined table */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3348 p = our_copy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3349 PyMem_RESIZE(p, struct _inittab, i+n+1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3350 if (p == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3351 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3352
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3353 /* Copy the tables into the new memory */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3354 if (our_copy != PyImport_Inittab)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3355 memcpy(p, PyImport_Inittab, (i+1) * sizeof(struct _inittab));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3356 PyImport_Inittab = our_copy = p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3357 memcpy(p+i, newtab, (n+1) * sizeof(struct _inittab));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3358
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3359 return 0;
8330 7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3360 }
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3361
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3362 /* Shorthand to add a single entry given a name and a function */
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3363
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3364 int
52718 1ef3da6c434c PyImport_AppendInittab() took a char * as a first argument even though that Brett Cannon <bcannon@gmail.com> parents: 51920 diff changeset	3365 PyImport_AppendInittab(const char name, void (initfunc)(void))
8330 7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3366 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3367 struct _inittab newtab[2];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3368
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3369 memset(newtab, '\0', sizeof newtab);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3370
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61269 diff changeset	3371 newtab[0].name = (char *)name;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3372 newtab[0].initfunc = initfunc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3373
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59822 diff changeset	3374 return PyImport_ExtendInittab(newtab);
8330 7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3375 }
37655 2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37488 diff changeset	3376
2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37488 diff changeset	3377 #ifdef __cplusplus
2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37488 diff changeset	3378 }
2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37488 diff changeset	3379 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/import.c @ 75490:2218a6cf75fc 2.7