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

annotate Python/import.c @ 64620:25cc226dc9bd

#4617: Previously it was illegal to delete a name from the local namespace if it occurs as a free variable in a nested block. This limitation of the compiler has been lifted, and a new opcode introduced (DELETE_DEREF). This sample was valid in 2.6, but fails to compile in 3.x without this change:: >>> def f(): ... def print_error(): ... print(e) ... try: ... something ... except Exception as e: ... print_error() ... # implicit "del e" here This sample has always been invalid in Python, and now works:: >>> def outer(x): ... def inner(): ... return x ... inner() ... del x There is no need to bump the PYC magic number: the new opcode is used for code that did not compile before.

author	Amaury Forgeot d'Arc <amauryfa@gmail.com>
date	Fri, 10 Sep 2010 21:39:53 +0000
parents	84217b2d8c0c
children	252895d49157

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"
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 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
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	21 #ifdef __cplusplus
59213 370e1a1c2386 Strip out trailing whitespace. Brett Cannon <bcannon@gmail.com> parents: 57629 diff changeset	22 extern "C" {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 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
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45471 diff changeset	25 #ifdef MS_WINDOWS
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45471 diff changeset	26 /* for stat.st_mode */
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45471 diff changeset	27 typedef unsigned short mode_t;
64594 84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	28 /* for _mkdir */
84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	29 #include <direct.h>
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45471 diff changeset	30 #endif
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45471 diff changeset	31
1351 e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	32
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	33 /* 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	34 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	35
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	36 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	37 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	38 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	39
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36926 diff changeset	40 The magic numbers must be spaced apart at least 2 values, as the
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32294 diff changeset	41 -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	42 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	43
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	44 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	45 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	46 10.
25085 5fe4d93df429 Because MWH changed the bytecode again, moved the magic number back Guido van Rossum <guido@python.org> parents: 24844 diff changeset	47
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	48 Starting with the adoption of PEP 3147 in Python 3.2, every bump in magic
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	49 number also includes a new "magic tag", i.e. a human readable string used
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	50 to represent the magic number in __pycache__ directories. When you change
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	51 the magic number, you must also set a new unique magic tag. Generally this
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	52 can be named after the Python major version of the magic number bump, but
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	53 it can really be anything, as long as it's different than anything else
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	54 that's come before. The tags are included in the following table, starting
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	55 with Python 3.2a0.
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	56
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	57 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	58 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	59 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	60 Python 1.5.2: 20121
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	61 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	62 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	63 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	64 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	65 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	66 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	67 Python 2.2: 60717
23851 d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	68 Python 2.3a0: 62011
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24071 diff changeset	69 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	70 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	71 Python 2.4a0: 62041
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 32882 diff changeset	72 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	73 Python 2.4b1: 62061
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34961 diff changeset	74 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	75 Python 2.5a0: 62081 (ast-branch)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36501 diff changeset	76 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	77 Python 2.5a0: 62092 (changed WITH_CLEANUP opcode)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	78 Python 2.5b3: 62101 (fix wrong code: for x, in ...)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	79 Python 2.5b3: 62111 (fix wrong code: x += yield)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	80 Python 2.5c1: 62121 (fix wrong lnotab with for loops and
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	81 storing constants that should have been removed)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	82 Python 2.5c2: 62131 (fix wrong code: for x, in ... in listcomp/genexp)
44349 4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44142 diff changeset	83 Python 2.6a0: 62151 (peephole optimizations and STORE_MAP opcode)
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	84 Python 2.6a1: 62161 (WITH_CLEANUP optimization)
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36926 diff changeset	85 Python 3000: 3000
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	86 3010 (removed UNARY_CONVERT)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	87 3020 (added BUILD_SET)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	88 3030 (added keyword-only parameters)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	89 3040 (added signature annotations)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	90 3050 (print becomes a function)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	91 3060 (PEP 3115 metaclass syntax)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	92 3061 (string literals become unicode)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	93 3071 (PEP 3109 raise changes)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	94 3081 (PEP 3137 make __file__ and __name__ unicode)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	95 3091 (kill str8 interning)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	96 3101 (merge from 2.6a0, see 62151)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	97 3103 (__file__ points to source file)
57629 8b8aee21d85e remove magic number bumping from the 2.x -U option #7459 Benjamin Peterson <benjamin@python.org> parents: 56381 diff changeset	98 Python 3.0a4: 3111 (WITH_CLEANUP optimization).
8b8aee21d85e remove magic number bumping from the 2.x -U option #7459 Benjamin Peterson <benjamin@python.org> parents: 56381 diff changeset	99 Python 3.0a5: 3131 (lexical exception stacking, including POP_EXCEPT)
8b8aee21d85e remove magic number bumping from the 2.x -U option #7459 Benjamin Peterson <benjamin@python.org> parents: 56381 diff changeset	100 Python 3.1a0: 3141 (optimize list, set and dict comprehensions:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	101 change LIST_APPEND and SET_ADD, add MAP_ADD)
57629 8b8aee21d85e remove magic number bumping from the 2.x -U option #7459 Benjamin Peterson <benjamin@python.org> parents: 56381 diff changeset	102 Python 3.1a0: 3151 (optimize conditional branches:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	103 introduce POP_JUMP_IF_FALSE and POP_JUMP_IF_TRUE)
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52721 diff changeset	104 Python 3.2a0: 3160 (add SETUP_WITH)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	105 tag: cpython-32
64439 725231211273 Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced Antoine Pitrou <solipsis@pitrou.net> parents: 64135 diff changeset	106 Python 3.2a1: 3170 (add DUP_TOP_TWO, remove DUP_TOPX and ROT_FOUR)
725231211273 Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced Antoine Pitrou <solipsis@pitrou.net> parents: 64135 diff changeset	107 tag: cpython-32
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	108 */
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52721 diff changeset	109
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	110 /* If you change MAGIC, you must change TAG and you must insert the old value
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	111 into _PyMagicNumberTags below.
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	112 */
64439 725231211273 Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced Antoine Pitrou <solipsis@pitrou.net> parents: 64135 diff changeset	113 #define MAGIC (3170 \| ((long)'\r'<<16) \| ((long)'\n'<<24))
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	114 #define TAG "cpython-32"
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	115 #define CACHEDIR "__pycache__"
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	116 /* Current magic word and string tag as globals. */
12543 c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	117 static long pyc_magic = MAGIC;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	118 static const char *pyc_tag = TAG;
12543 c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	119
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	120 /* 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	121 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	122
6541 b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	123 /* 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	124 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	125
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	126 /* Method from Parser/tokenizer.c */
43632 0067a6ab4854 Issue 1267, continued. Guido van Rossum <guido@python.org> parents: 43608 diff changeset	127 extern char * PyTokenizer_FindEncoding(int);
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	128
6541 b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	129 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	130
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	131 /* 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	132 struct filedescr * _PyImport_Filetab = NULL;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	133
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	134 static const struct filedescr _PyImport_StandardFiletab[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	135 {".py", "U", PY_SOURCE},
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23879 diff changeset	136 #ifdef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	137 {".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	138 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	139 {".pyc", "rb", PY_COMPILED},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	140 {0, 0}
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	141 };
5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	142
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	143
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	144 /* Initialize things */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	145
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	146 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	147 _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	148 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	149 const struct filedescr *scan;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	150 struct filedescr *filetab;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	151 int countD = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	152 int countS = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	153
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	154 /* prepare _PyImport_Filetab: copy entries from
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	155 _PyImport_DynLoadFiletab and _PyImport_StandardFiletab.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	156 */
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	157 #ifdef HAVE_DYNAMIC_LOADING
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	158 for (scan = _PyImport_DynLoadFiletab; scan->suffix != NULL; ++scan)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	159 ++countD;
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	160 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	161 for (scan = _PyImport_StandardFiletab; scan->suffix != NULL; ++scan)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	162 ++countS;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	163 filetab = PyMem_NEW(struct filedescr, countD + countS + 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	164 if (filetab == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	165 Py_FatalError("Can't initialize import file table.");
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	166 #ifdef HAVE_DYNAMIC_LOADING
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	167 memcpy(filetab, _PyImport_DynLoadFiletab,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	168 countD * sizeof(struct filedescr));
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	169 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	170 memcpy(filetab + countD, _PyImport_StandardFiletab,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	171 countS * sizeof(struct filedescr));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	172 filetab[countD + countS].suffix = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	173
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	174 _PyImport_Filetab = filetab;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	175
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	176 if (Py_OptimizeFlag) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	177 /* Replace ".pyc" with ".pyo" in _PyImport_Filetab */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	178 for (; filetab->suffix != NULL; filetab++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	179 if (strcmp(filetab->suffix, ".pyc") == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	180 filetab->suffix = ".pyo";
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	181 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	182 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	183 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	184
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	185 void
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	186 _PyImportHooks_Init(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	187 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	188 PyObject v, path_hooks = NULL, *zimpimport;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	189 int err = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	190
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	191 /* adding sys.path_hooks and sys.path_importer_cache, setting up
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	192 zipimport */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	193 if (PyType_Ready(&PyNullImporter_Type) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	194 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	195
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	196 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	197 PySys_WriteStderr("# installing zipimport hook\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	198
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	199 v = PyList_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	200 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	201 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	202 err = PySys_SetObject("meta_path", v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	203 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	204 if (err)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	205 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	206 v = PyDict_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	207 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	208 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	209 err = PySys_SetObject("path_importer_cache", v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	210 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	211 if (err)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	212 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	213 path_hooks = PyList_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	214 if (path_hooks == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	215 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	216 err = PySys_SetObject("path_hooks", path_hooks);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	217 if (err) {
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	218 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	219 PyErr_Print();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	220 Py_FatalError("initializing sys.meta_path, sys.path_hooks, "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	221 "path_importer_cache, or NullImporter failed"
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	222 );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	223 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	224
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	225 zimpimport = PyImport_ImportModule("zipimport");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	226 if (zimpimport == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	227 PyErr_Clear(); /* No zip import module -- okay */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	228 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	229 PySys_WriteStderr("# can't import zipimport\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	230 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	231 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	232 PyObject *zipimporter = PyObject_GetAttrString(zimpimport,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	233 "zipimporter");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	234 Py_DECREF(zimpimport);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	235 if (zipimporter == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	236 PyErr_Clear(); /* No zipimporter object -- okay */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	237 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	238 PySys_WriteStderr(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	239 "# can't import zipimport.zipimporter\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	240 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	241 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	242 /* sys.path_hooks.append(zipimporter) */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	243 err = PyList_Append(path_hooks, zipimporter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	244 Py_DECREF(zipimporter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	245 if (err)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	246 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	247 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	248 PySys_WriteStderr(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	249 "# installed zipimport hook\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	250 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	251 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	252 Py_DECREF(path_hooks);
26885 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
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	255 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	256 _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	257 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	258 Py_XDECREF(extensions);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	259 extensions = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	260 PyMem_DEL(_PyImport_Filetab);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	261 _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	262 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	263
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	264
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	265 /* 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	266 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	267 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	268
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 #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	270
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9187 diff changeset	271 #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	272
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9431 diff changeset	273 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	274 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	275 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	276
56381 2b7e0eaac64e Merged revisions 74841 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55504 diff changeset	277 void
2b7e0eaac64e Merged revisions 74841 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55504 diff changeset	278 _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	279 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	280 long me = PyThread_get_thread_ident();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	281 if (me == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	282 return; /* Too bad */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	283 if (import_lock == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	284 import_lock = PyThread_allocate_lock();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	285 if (import_lock == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	286 return; /* Nothing much we can do. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	287 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	288 if (import_lock_thread == me) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	289 import_lock_level++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	290 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	291 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	292 if (import_lock_thread != -1 \|\| !PyThread_acquire_lock(import_lock, 0))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	293 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	294 PyThreadState *tstate = PyEval_SaveThread();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	295 PyThread_acquire_lock(import_lock, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	296 PyEval_RestoreThread(tstate);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	297 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	298 import_lock_thread = me;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	299 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	300 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	301
56381 2b7e0eaac64e Merged revisions 74841 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55504 diff changeset	302 int
2b7e0eaac64e Merged revisions 74841 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55504 diff changeset	303 _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	304 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	305 long me = PyThread_get_thread_ident();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	306 if (me == -1 \|\| import_lock == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	307 return 0; /* Too bad */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	308 if (import_lock_thread != me)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	309 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	310 import_lock_level--;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	311 if (import_lock_level == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	312 import_lock_thread = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	313 PyThread_release_lock(import_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	314 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	315 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	316 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	317
59235 58c35495a934 Merged revisions 78527,78550 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 59213 diff changeset	318 /* This function is called from PyOS_AfterFork to ensure that newly
58c35495a934 Merged revisions 78527,78550 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 59213 diff changeset	319 created child processes do not share locks with the parent.
58c35495a934 Merged revisions 78527,78550 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 59213 diff changeset	320 We now acquire the import lock around fork() calls but on some platforms
58c35495a934 Merged revisions 78527,78550 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 59213 diff changeset	321 (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	322
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 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 _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	325 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	326 if (import_lock != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	327 import_lock = PyThread_allocate_lock();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	328 import_lock_thread = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	329 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	330 }
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	331
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	332 #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	333
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	334 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	335 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	336 {
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	337 #ifdef WITH_THREAD
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	338 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	339 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	340 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	341 #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	342 }
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	343
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	344 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	345 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	346 {
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	347 #ifdef WITH_THREAD
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	348 _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	349 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	350 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	351 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	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
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	354 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	355 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	356 {
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	357 #ifdef WITH_THREAD
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	358 if (_PyImport_ReleaseLock() < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	359 PyErr_SetString(PyExc_RuntimeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	360 "not holding the import lock");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	361 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	362 }
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	363 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	364 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	365 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	366 }
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	367
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	368 static void
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	369 imp_modules_reloading_clear(void)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	370 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	371 PyInterpreterState *interp = PyThreadState_Get()->interp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	372 if (interp->modules_reloading != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	373 PyDict_Clear(interp->modules_reloading);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	374 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	375
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	376 /* Helper for sys */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	377
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	378 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	379 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	380 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	381 PyInterpreterState *interp = PyThreadState_GET()->interp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	382 if (interp->modules == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	383 Py_FatalError("PyImport_GetModuleDict: no module dictionary!");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	384 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	385 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	386
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	387
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	388 /* 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	389 static char* sys_deletes[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	390 "path", "argv", "ps1", "ps2",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	391 "last_type", "last_value", "last_traceback",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	392 "path_hooks", "path_importer_cache", "meta_path",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	393 /* misc stuff */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	394 "flags", "float_info",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 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[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	399 "stdin", "__stdin__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	400 "stdout", "__stdout__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	401 "stderr", "__stderr__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 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 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	411 Py_ssize_t pos, ndone;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	412 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	413 PyObject key, value, *dict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	414 PyInterpreterState *interp = PyThreadState_GET()->interp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	415 PyObject *modules = interp->modules;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	416
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	417 if (modules == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	418 return; /* Already done */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	419
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	420 /* Delete some special variables first. These are common
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	421 places where user values hide and people complain when their
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	422 destructors fail. Since the modules containing them are
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	423 deleted last of all, they would come too late in the normal
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	424 destruction order. Sigh. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	425
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	426 value = PyDict_GetItemString(modules, "builtins");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	427 if (value != NULL && PyModule_Check(value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	428 dict = PyModule_GetDict(value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	429 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	430 PySys_WriteStderr("# clear builtins._\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	431 PyDict_SetItemString(dict, "_", Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	432 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	433 value = PyDict_GetItemString(modules, "sys");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	434 if (value != NULL && PyModule_Check(value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	435 char **p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	436 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	437 dict = PyModule_GetDict(value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	438 for (p = sys_deletes; *p != NULL; p++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	439 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	440 PySys_WriteStderr("# clear sys.%s\n", *p);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	441 PyDict_SetItemString(dict, *p, Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	442 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	443 for (p = sys_files; *p != NULL; p+=2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	444 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	445 PySys_WriteStderr("# restore sys.%s\n", *p);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	446 v = PyDict_GetItemString(dict, *(p+1));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	447 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	448 v = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	449 PyDict_SetItemString(dict, *p, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	450 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	451 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	452
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	453 /* First, delete __main__ */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	454 value = PyDict_GetItemString(modules, "__main__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	455 if (value != NULL && PyModule_Check(value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	456 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	457 PySys_WriteStderr("# cleanup __main__\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	458 _PyModule_Clear(value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	459 PyDict_SetItemString(modules, "__main__", Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	460 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	461
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	462 /* The special treatment of "builtins" here is because even
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	463 when it's not referenced as a module, its dictionary is
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	464 referenced by almost every module's __builtins__. Since
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	465 deleting a module clears its dictionary (even if there are
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	466 references left to it), we need to delete the "builtins"
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	467 module last. Likewise, we don't delete sys until the very
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	468 end because it is implicitly referenced (e.g. by print).
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	469
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	470 Also note that we 'delete' modules by replacing their entry
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	471 in the modules dict with None, rather than really deleting
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	472 them; this avoids a rehash of the modules dictionary and
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	473 also marks them as "non existent" so they won't be
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	474 re-imported. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	475
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	476 /* Next, repeatedly delete modules with a reference count of
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	477 one (skipping builtins and sys) and delete them */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	478 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	479 ndone = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	480 pos = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	481 while (PyDict_Next(modules, &pos, &key, &value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	482 if (value->ob_refcnt != 1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	483 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	484 if (PyUnicode_Check(key) && PyModule_Check(value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	485 name = _PyUnicode_AsString(key);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	486 if (strcmp(name, "builtins") == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	487 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	488 if (strcmp(name, "sys") == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	489 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	490 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	491 PySys_WriteStderr(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	492 "# cleanup[1] %s\n", name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	493 _PyModule_Clear(value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	494 PyDict_SetItem(modules, key, Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	495 ndone++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	496 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	497 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	498 } while (ndone > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	499
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	500 /* Next, delete all modules (still skipping builtins and sys) */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	501 pos = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	502 while (PyDict_Next(modules, &pos, &key, &value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	503 if (PyUnicode_Check(key) && PyModule_Check(value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	504 name = _PyUnicode_AsString(key);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	505 if (strcmp(name, "builtins") == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	506 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	507 if (strcmp(name, "sys") == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	508 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	509 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	510 PySys_WriteStderr("# cleanup[2] %s\n", name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	511 _PyModule_Clear(value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	512 PyDict_SetItem(modules, key, Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	513 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	514 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	515
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	516 /* Next, delete sys and builtins (in that order) */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	517 value = PyDict_GetItemString(modules, "sys");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	518 if (value != NULL && PyModule_Check(value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	519 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	520 PySys_WriteStderr("# cleanup sys\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	521 _PyModule_Clear(value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	522 PyDict_SetItemString(modules, "sys", Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	523 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	524 value = PyDict_GetItemString(modules, "builtins");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	525 if (value != NULL && PyModule_Check(value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	526 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	527 PySys_WriteStderr("# cleanup builtins\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	528 _PyModule_Clear(value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	529 PyDict_SetItemString(modules, "builtins", Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	530 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	531
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	532 /* Finally, clear and delete the modules directory */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	533 PyDict_Clear(modules);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	534 interp->modules = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	535 Py_DECREF(modules);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 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
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	540 /* Helper for pythonrun.c -- return magic number and tag. */
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 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 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
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	549 const char *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	550 PyImport_GetMagicTag(void)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	551 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	552 return pyc_tag;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	553 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	554
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	555 /* 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	556 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	557 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	558 (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	559 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	560 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	561 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	562 copy can be retrieved from there by calling
59213 370e1a1c2386 Strip out trailing whitespace. Brett Cannon <bcannon@gmail.com> parents: 57629 diff changeset	563 _PyImport_FindExtension().
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	564
62385 46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	565 Modules which do support multiple initialization set their m_size
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	566 field to a non-negative number (indicating the size of the
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	567 module-specific state). They are still recorded in the extensions
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	568 dictionary, to avoid loading shared libraries twice.
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	569 */
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	570
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	571 int
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	572 _PyImport_FixupExtension(PyObject mod, char name, char *filename)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	573 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	574 PyObject modules, dict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	575 struct PyModuleDef *def;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	576 if (extensions == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	577 extensions = PyDict_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	578 if (extensions == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	579 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	580 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	581 if (mod == NULL \|\| !PyModule_Check(mod)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	582 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	583 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	584 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	585 def = PyModule_GetDef(mod);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	586 if (!def) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	587 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	588 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	589 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	590 modules = PyImport_GetModuleDict();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	591 if (PyDict_SetItemString(modules, name, mod) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	592 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	593 if (_PyState_AddModule(mod, def) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	594 PyDict_DelItemString(modules, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	595 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	596 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	597 if (def->m_size == -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	598 if (def->m_base.m_copy) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	599 /* Somebody already imported the module,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	600 likely under a different name.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	601 XXX this should really not happen. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	602 Py_DECREF(def->m_base.m_copy);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	603 def->m_base.m_copy = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	604 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	605 dict = PyModule_GetDict(mod);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	606 if (dict == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	607 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	608 def->m_base.m_copy = PyDict_Copy(dict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	609 if (def->m_base.m_copy == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	610 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	611 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	612 PyDict_SetItemString(extensions, filename, (PyObject*)def);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	613 return 0;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	614 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	615
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	616 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	617 _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	618 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	619 PyObject mod, mdict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	620 PyModuleDef* def;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	621 if (extensions == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	622 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	623 def = (PyModuleDef*)PyDict_GetItemString(extensions, filename);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	624 if (def == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	625 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	626 if (def->m_size == -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	627 /* Module does not support repeated initialization */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	628 if (def->m_base.m_copy == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	629 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	630 mod = PyImport_AddModule(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	631 if (mod == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	632 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	633 mdict = PyModule_GetDict(mod);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	634 if (mdict == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	635 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	636 if (PyDict_Update(mdict, def->m_base.m_copy))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	637 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	638 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	639 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	640 if (def->m_base.m_init == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	641 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	642 mod = def->m_base.m_init();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	643 if (mod == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	644 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	645 PyDict_SetItemString(PyImport_GetModuleDict(), name, mod);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	646 Py_DECREF(mod);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	647 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	648 if (_PyState_AddModule(mod, def) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	649 PyDict_DelItemString(PyImport_GetModuleDict(), name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	650 Py_DECREF(mod);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	651 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	652 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	653 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	654 PySys_WriteStderr("import %s # previously loaded (%s)\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	655 name, filename);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	656 return mod;
59213 370e1a1c2386 Strip out trailing whitespace. Brett Cannon <bcannon@gmail.com> parents: 57629 diff changeset	657
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	658 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	659
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	660
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	661 /* 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	662 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	663 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	664 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	665 '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	666
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	667 PyObject *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35757 diff changeset	668 PyImport_AddModule(const char *name)
40 f28ac7f621c7 Added reload() functionality. Guido van Rossum <guido@python.org> parents: 6 diff changeset	669 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	670 PyObject *modules = PyImport_GetModuleDict();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	671 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	672
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	673 if ((m = PyDict_GetItemString(modules, name)) != NULL &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	674 PyModule_Check(m))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	675 return m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	676 m = PyModule_New(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	677 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	678 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	679 if (PyDict_SetItemString(modules, name, m) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	680 Py_DECREF(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	681 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	682 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	683 Py_DECREF(m); /* Yes, it still exists, in modules! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	684
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	685 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	686 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	687
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	688 /* 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	689 static void
60022 1a0e217063b7 Merged revisions 79428 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 59538 diff changeset	690 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	691 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	692 PyObject *modules = PyImport_GetModuleDict();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	693 if (PyDict_GetItemString(modules, name) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	694 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	695 if (PyDict_DelItemString(modules, name) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	696 Py_FatalError("import: deleting existing key in"
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	697 "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	698 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	699
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	700 static PyObject * get_sourcefile(char *file);
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	701 static char make_source_pathname(char pathname, char *buf);
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	702 static char make_compiled_pathname(char pathname, char *buf, size_t buflen,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	703 int debug);
44583 73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	704
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	705 /* 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	706 * 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	707 * 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	708 * 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	709 * 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	710 * example.
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	711 *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	712 * Note that PyImport_ExecCodeModuleWithPathnames() is the preferred, richer
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	713 * interface. The other two exist primarily for backward compatibility.
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	714 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	715 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	716 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	717 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	718 return PyImport_ExecCodeModuleWithPathnames(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	719 name, co, (char )NULL, (char )NULL);
7232 74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	720 }
74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	721
74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	722 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	723 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	724 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	725 return PyImport_ExecCodeModuleWithPathnames(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	726 name, co, pathname, (char *)NULL);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	727 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	728
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	729 PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	730 PyImport_ExecCodeModuleWithPathnames(char name, PyObject co, char *pathname,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	731 char *cpathname)
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	732 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	733 PyObject *modules = PyImport_GetModuleDict();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	734 PyObject m, d, *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	735
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	736 m = PyImport_AddModule(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	737 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	738 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	739 /* If the module is being reloaded, we get the old module back
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	740 and re-use its dict to exec the new code. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	741 d = PyModule_GetDict(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	742 if (PyDict_GetItemString(d, "__builtins__") == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	743 if (PyDict_SetItemString(d, "__builtins__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	744 PyEval_GetBuiltins()) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	745 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	746 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	747 /* Remember the filename as the __file__ attribute */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	748 v = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	749 if (pathname != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	750 v = get_sourcefile(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	751 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	752 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	753 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	754 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	755 v = ((PyCodeObject *)co)->co_filename;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	756 Py_INCREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	757 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	758 if (PyDict_SetItemString(d, "__file__", v) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	759 PyErr_Clear(); /* Not important enough to report */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	760 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	761
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	762 /* Remember the pyc path name as the __cached__ attribute. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	763 if (cpathname == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	764 v = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	765 Py_INCREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	766 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	767 else if ((v = PyUnicode_FromString(cpathname)) == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	768 PyErr_Clear(); /* Not important enough to report */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	769 v = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	770 Py_INCREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	771 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	772 if (PyDict_SetItemString(d, "__cached__", v) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	773 PyErr_Clear(); /* Not important enough to report */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	774 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	775
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	776 v = PyEval_EvalCode((PyCodeObject *)co, d, d);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	777 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	778 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	779 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	780
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	781 if ((m = PyDict_GetItemString(modules, name)) == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	782 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	783 "Loaded module %.200s not found in sys.modules",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	784 name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	785 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	786 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	787
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	788 Py_INCREF(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	789
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	790 return m;
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	791
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	792 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	793 remove_module(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	794 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	795 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	796
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	797
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	798 /* Like strrchr(string, '/') but searches for the rightmost of either SEP
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	799 or ALTSEP, if the latter is defined.
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	800 */
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	801 static char *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	802 rightmost_sep(char *s)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	803 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	804 char *found, c;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	805 for (found = NULL; (c = *s); s++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	806 if (c == SEP
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	807 #ifdef ALTSEP
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	808 \|\| c == ALTSEP
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	809 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	810 )
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	811 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	812 found = s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	813 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	814 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	815 return found;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	816 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	817
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	818
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	819 /* 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	820 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	821 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	822 Doesn't set an exception. */
609 0ad5b35e3ad8 Support for dynamic loading added. Guido van Rossum <guido@python.org> parents: 510 diff changeset	823
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	824 static char *
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	825 make_compiled_pathname(char pathname, char buf, size_t buflen, int debug)
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	826 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	827 /* foo.py -> __pycache__/foo.<tag>.pyc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	828 size_t len = strlen(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	829 size_t i, save;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	830 char *pos;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	831 int sep = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	832
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	833 /* Sanity check that the buffer has roughly enough space to hold what
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	834 will eventually be the full path to the compiled file. The 5 extra
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	835 bytes include the slash afer __pycache__, the two extra dots, the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	836 extra trailing character ('c' or 'o') and null. This isn't exact
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	837 because the contents of the buffer can affect how many actual
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	838 characters of the string get into the buffer. We'll do a final
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	839 sanity check before writing the extension to ensure we do not
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	840 overflow the buffer.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	841 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	842 if (len + strlen(CACHEDIR) + strlen(pyc_tag) + 5 > buflen)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	843 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	844
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	845 /* Find the last path separator and copy everything from the start of
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	846 the source string up to and including the separator.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	847 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	848 if ((pos = rightmost_sep(pathname)) == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	849 i = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	850 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	851 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	852 sep = *pos;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	853 i = pos - pathname + 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	854 strncpy(buf, pathname, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	855 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	856
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	857 save = i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	858 buf[i++] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	859 /* Add __pycache__/ */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	860 strcat(buf, CACHEDIR);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	861 i += strlen(CACHEDIR) - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	862 buf[i++] = sep;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	863 buf[i++] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	864 /* Add the base filename, but remove the .py or .pyw extension, since
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	865 the tag name must go before the extension.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	866 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	867 strcat(buf, pathname + save);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	868 if ((pos = strrchr(buf, '.')) != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	869 *++pos = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	870 strcat(buf, pyc_tag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	871 /* The length test above assumes that we're only adding one character
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	872 to the end of what would normally be the extension. What if there
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	873 is no extension, or the string ends in '.' or '.p', and otherwise
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	874 fills the buffer? By appending 4 more characters onto the string
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	875 here, we could overrun the buffer.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	876
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	877 As a simple example, let's say buflen=32 and the input string is
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	878 'xxx.py'. strlen() would be 6 and the test above would yield:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	879
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	880 (6 + 11 + 10 + 5 == 32) > 32
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	881
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	882 which is false and so the name mangling would continue. This would
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	883 be fine because we'd end up with this string in buf:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	884
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	885 __pycache__/xxx.cpython-32.pyc\0
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	886
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	887 strlen(of that) == 30 + the nul fits inside a 32 character buffer.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	888 We can even handle an input string of say 'xxxxx' above because
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	889 that's (5 + 11 + 10 + 5 == 31) > 32 which is also false. Name
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	890 mangling that yields:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	891
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	892 __pycache__/xxxxxcpython-32.pyc\0
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	893
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	894 which is 32 characters including the nul, and thus fits in the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	895 buffer. However, an input string of 'xxxxxx' would yield a result
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	896 string of:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	897
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	898 __pycache__/xxxxxxcpython-32.pyc\0
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	899
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	900 which is 33 characters long (including the nul), thus overflowing
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	901 the buffer, even though the first test would fail, i.e.: the input
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	902 string is also 6 characters long, so 32 > 32 is false.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	903
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	904 The reason the first test fails but we still overflow the buffer is
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	905 that the test above only expects to add one extra character to be
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	906 added to the extension, and here we're adding three (pyc). We
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	907 don't add the first dot, so that reclaims one of expected
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	908 positions, leaving us overflowing by 1 byte (3 extra - 1 reclaimed
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	909 dot - 1 expected extra == 1 overflowed).
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	910
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	911 The best we can do is ensure that we still have enough room in the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	912 target buffer before we write the extension. Because it's always
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	913 only the extension that can cause the overflow, and never the other
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	914 path bytes we've written, it's sufficient to just do one more test
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	915 here. Still, the assertion that follows can't hurt.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	916 */
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	917 #if 0
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	918 printf("strlen(buf): %d; buflen: %d\n", (int)strlen(buf), (int)buflen);
18992 7fa1f87ca6b2 Derived from SF patch #446899 Permit import of .pyw under Windows, from Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	919 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	920 if (strlen(buf) + 5 > buflen)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	921 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	922 strcat(buf, debug ? ".pyc" : ".pyo");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	923 assert(strlen(buf) < buflen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	924 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	925 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	926
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	927
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	928 /* Given a pathname to a Python byte compiled file, return the path to the
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	929 source file, if the path matches the PEP 3147 format. This does not check
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	930 for any file existence, however, if the pyc file name does not match PEP
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	931 3147 style, NULL is returned. buf must be at least as big as pathname;
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	932 the resulting path will always be shorter. */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	933
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	934 static char *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	935 make_source_pathname(char pathname, char buf)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	936 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	937 /* __pycache__/foo.<tag>.pyc -> foo.py */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	938 size_t i, j;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	939 char left, right, dot0, dot1, sep;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	940
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	941 /* Look back two slashes from the end. In between these two slashes
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	942 must be the string __pycache__ or this is not a PEP 3147 style
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	943 path. It's possible for there to be only one slash.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	944 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	945 if ((right = rightmost_sep(pathname)) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	946 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	947 sep = *right;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	948 *right = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	949 left = rightmost_sep(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	950 *right = sep;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	951 if (left == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	952 left = pathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	953 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	954 left++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	955 if (right-left != strlen(CACHEDIR) \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	956 strncmp(left, CACHEDIR, right-left) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	957 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	958
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	959 /* Now verify that the path component to the right of the last slash
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	960 has two dots in it.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	961 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	962 if ((dot0 = strchr(right + 1, '.')) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	963 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	964 if ((dot1 = strchr(dot0 + 1, '.')) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	965 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	966 /* Too many dots? */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	967 if (strchr(dot1 + 1, '.') != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	968 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	969
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	970 /* This is a PEP 3147 path. Start by copying everything from the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	971 start of pathname up to and including the leftmost slash. Then
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	972 copy the file's basename, removing the magic tag and adding a .py
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	973 suffix.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	974 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	975 strncpy(buf, pathname, (i=left-pathname));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	976 strncpy(buf+i, right+1, (j=dot0-right));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	977 strcpy(buf+i+j, "py");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	978 return buf;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	979 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	980
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	981 /* 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	982 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	983 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	984 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	985 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	986 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	987
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	988 static FILE *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	989 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	990 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	991 FILE *fp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	992 long magic;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	993 long pyc_mtime;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	994
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	995 fp = fopen(cpathname, "rb");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	996 if (fp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	997 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	998 magic = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	999 if (magic != pyc_magic) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1000 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1001 PySys_WriteStderr("# %s has bad magic\n", cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1002 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1003 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1004 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1005 pyc_mtime = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1006 if (pyc_mtime != mtime) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1007 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1008 PySys_WriteStderr("# %s has bad mtime\n", cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1009 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1010 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1011 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1012 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1013 PySys_WriteStderr("# %s matches %s\n", cpathname, pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1014 return fp;
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	1015 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1016
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1017
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1018 /* 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	1019
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1020 static PyCodeObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1021 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	1022 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1023 PyObject *co;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1024
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1025 co = PyMarshal_ReadLastObjectFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1026 if (co == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1027 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1028 if (!PyCode_Check(co)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1029 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1030 "Non-code object in %.200s", cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1031 Py_DECREF(co);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1032 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1033 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1034 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	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
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1038 /* 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	1039 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	1040
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1041 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1042 load_compiled_module(char name, char cpathname, FILE *fp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1043 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1044 long magic;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1045 PyCodeObject *co;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1046 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1047
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1048 magic = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1049 if (magic != pyc_magic) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1050 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1051 "Bad magic number in %.200s", cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1052 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1053 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1054 (void) PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1055 co = read_compiled_module(cpathname, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1056 if (co == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1057 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1058 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1059 PySys_WriteStderr("import %s # precompiled from %s\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1060 name, cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1061 m = PyImport_ExecCodeModuleWithPathnames(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1062 name, (PyObject *)co, cpathname, cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1063 Py_DECREF(co);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1064
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1065 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	1066 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1067
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1068 /* 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	1069
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1070 static PyCodeObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35678 diff changeset	1071 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	1072 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1073 PyCodeObject *co = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1074 mod_ty mod;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1075 PyCompilerFlags flags;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1076 PyArena *arena = PyArena_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1077 if (arena == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1078 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1079
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1080 flags.cf_flags = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1081 mod = PyParser_ASTFromFile(fp, pathname, NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1082 Py_file_input, 0, 0, &flags,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1083 NULL, arena);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1084 if (mod) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1085 co = PyAST_Compile(mod, pathname, NULL, arena);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1086 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1087 PyArena_Free(arena);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1088 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	1089 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1090
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1091
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	1092 /* 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	1093
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	1094 static FILE *
45471 7dd2c1746267 Merged revisions 60990-61002 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1095 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	1096 {
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	1097 #if defined(O_EXCL)&&defined(O_CREAT)&&defined(O_WRONLY)&&defined(O_TRUNC)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1098 /* Use O_EXCL to avoid a race condition when another process tries to
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1099 write the same file. When that happens, our open() call fails,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1100 which is just fine (since it's only a cache).
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1101 XXX If the file exists and is writable but the directory is not
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1102 writable, the file will never be written. Oh well.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1103 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1104 int fd;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1105 (void) unlink(filename);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1106 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	1107 #ifdef O_BINARY
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1108 \|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	1109 #endif
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26461 diff changeset	1110 #ifdef __VMS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1111 , mode, "ctxt=bin", "shr=nil"
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26461 diff changeset	1112 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1113 , mode
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26461 diff changeset	1114 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1115 );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1116 if (fd < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1117 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1118 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	1119 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1120 /* Best we can do -- on Windows this can't happen anyway */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1121 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	1122 #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	1123 }
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	1124
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	1125
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1126 /* 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	1127 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	1128 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	1129 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	1130
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1131 static void
45471 7dd2c1746267 Merged revisions 60990-61002 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1132 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	1133 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1134 FILE *fp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1135 char *dirpath;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1136 time_t mtime = srcstat->st_mtime;
55304 c075b974c35c Merged revisions 73870,73879,73899-73900,73905-73906 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54889 diff changeset	1137 #ifdef MS_WINDOWS /* since Windows uses different permissions */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1138 mode_t mode = srcstat->st_mode & ~S_IEXEC;
55304 c075b974c35c Merged revisions 73870,73879,73899-73900,73905-73906 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54889 diff changeset	1139 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1140 mode_t mode = srcstat->st_mode & ~S_IXUSR & ~S_IXGRP & ~S_IXOTH;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1141 mode_t dirmode = (srcstat->st_mode \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1142 S_IXUSR \| S_IXGRP \| S_IXOTH \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1143 S_IWUSR \| S_IWGRP \| S_IWOTH);
59213 370e1a1c2386 Strip out trailing whitespace. Brett Cannon <bcannon@gmail.com> parents: 57629 diff changeset	1144 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1145 int saved;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1146
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1147 /* Ensure that the __pycache__ directory exists. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1148 dirpath = rightmost_sep(cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1149 if (dirpath == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1150 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1151 PySys_WriteStderr(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1152 "# no %s path found %s\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1153 CACHEDIR, cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1154 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1155 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1156 saved = *dirpath;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1157 *dirpath = '\0';
64594 84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1158
84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1159 #ifdef MS_WINDOWS
84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1160 if (_mkdir(cpathname) < 0 && errno != EEXIST) {
84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1161 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1162 if (mkdir(cpathname, dirmode) < 0 && errno != EEXIST) {
64594 84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1163 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1164 *dirpath = saved;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1165 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1166 PySys_WriteStderr(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1167 "# cannot create cache dir %s\n", cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1168 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1169 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1170 *dirpath = saved;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1171
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1172 fp = open_exclusive(cpathname, mode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1173 if (fp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1174 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1175 PySys_WriteStderr(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1176 "# can't create %s\n", cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1177 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1178 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1179 PyMarshal_WriteLongToFile(pyc_magic, fp, Py_MARSHAL_VERSION);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1180 /* First write a 0 for mtime */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1181 PyMarshal_WriteLongToFile(0L, fp, Py_MARSHAL_VERSION);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1182 PyMarshal_WriteObjectToFile((PyObject *)co, fp, Py_MARSHAL_VERSION);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1183 if (fflush(fp) != 0 \|\| ferror(fp)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1184 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1185 PySys_WriteStderr("# can't write %s\n", cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1186 /* Don't keep partial file */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1187 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1188 (void) unlink(cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1189 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1190 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1191 /* Now write the true mtime */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1192 fseek(fp, 4L, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1193 assert(mtime < LONG_MAX);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1194 PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1195 fflush(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1196 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1197 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1198 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	1199 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1200
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1201 static void
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1202 update_code_filenames(PyCodeObject co, PyObject oldname, PyObject *newname)
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1203 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1204 PyObject constants, tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1205 Py_ssize_t i, n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1206
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1207 if (PyUnicode_Compare(co->co_filename, oldname))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1208 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1209
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1210 tmp = co->co_filename;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1211 co->co_filename = newname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1212 Py_INCREF(co->co_filename);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1213 Py_DECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1214
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1215 constants = co->co_consts;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1216 n = PyTuple_GET_SIZE(constants);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1217 for (i = 0; i < n; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1218 tmp = PyTuple_GET_ITEM(constants, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1219 if (PyCode_Check(tmp))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1220 update_code_filenames((PyCodeObject *)tmp,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1221 oldname, newname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1222 }
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1223 }
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1224
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1225 static int
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1226 update_compiled_module(PyCodeObject co, char pathname)
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1227 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1228 PyObject oldname, newname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1229
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1230 newname = PyUnicode_DecodeFSDefault(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1231 if (newname == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1232 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1233
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1234 if (!PyUnicode_Compare(co->co_filename, newname)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1235 Py_DECREF(newname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1236 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1237 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1238
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1239 oldname = co->co_filename;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1240 Py_INCREF(oldname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1241 update_code_filenames(co, oldname, newname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1242 Py_DECREF(oldname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1243 Py_DECREF(newname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1244 return 1;
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1245 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1246
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1247 /* 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	1248 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	1249 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	1250
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1251 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1252 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	1253 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1254 struct stat st;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1255 FILE *fpc;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1256 char buf[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1257 char *cpathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1258 PyCodeObject *co;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1259 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1260
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1261 if (fstat(fileno(fp), &st) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1262 PyErr_Format(PyExc_RuntimeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1263 "unable to get file status from '%s'",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1264 pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1265 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1266 }
13226 12437deb0680 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13181 diff changeset	1267 #if SIZEOF_TIME_T > 4
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1268 /* Python's .pyc timestamp handling presumes that the timestamp fits
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1269 in 4 bytes. This will be fine until sometime in the year 2038,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1270 when a 4-byte signed time_t will overflow.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1271 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1272 if (st.st_mtime >> 32) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1273 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1274 "modification time overflows a 4 byte field");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1275 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1276 }
13226 12437deb0680 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13181 diff changeset	1277 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1278 cpathname = make_compiled_pathname(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1279 pathname, buf, (size_t)MAXPATHLEN + 1, !Py_OptimizeFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1280 if (cpathname != NULL &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1281 (fpc = check_compiled_module(pathname, st.st_mtime, cpathname))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1282 co = read_compiled_module(cpathname, fpc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1283 fclose(fpc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1284 if (co == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1285 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1286 if (update_compiled_module(co, pathname) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1287 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1288 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1289 PySys_WriteStderr("import %s # precompiled from %s\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1290 name, cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1291 pathname = cpathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1292 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1293 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1294 co = parse_source_module(pathname, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1295 if (co == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1296 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1297 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1298 PySys_WriteStderr("import %s # from %s\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1299 name, pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1300 if (cpathname) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1301 PyObject *ro = PySys_GetObject("dont_write_bytecode");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1302 if (ro == NULL \|\| !PyObject_IsTrue(ro))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1303 write_compiled_module(co, cpathname, &st);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1304 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1305 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1306 m = PyImport_ExecCodeModuleWithPathnames(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1307 name, (PyObject *)co, pathname, cpathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1308 Py_DECREF(co);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1309
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1310 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	1311 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1312
44583 73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	1313 /* Get source file -> unicode or None
73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	1314 * Returns the path to the py file if available, else the given path
73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	1315 */
73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	1316 static PyObject *
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	1317 get_sourcefile(char *file)
44583 73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	1318 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1319 char py[MAXPATHLEN + 1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1320 Py_ssize_t len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1321 PyObject *u;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1322 struct stat statbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1323
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1324 if (!file \|\| !*file) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1325 Py_RETURN_NONE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1326 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1327
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1328 len = strlen(file);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1329 /* match '.py?' /
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1330 if (len > MAXPATHLEN \|\| PyOS_strnicmp(&file[len-4], ".py", 3) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1331 return PyUnicode_DecodeFSDefault(file);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1332 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1333
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1334 /* Start by trying to turn PEP 3147 path into source path. If that
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1335 * fails, just chop off the trailing character, i.e. legacy pyc path
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1336 * to py.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1337 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1338 if (make_source_pathname(file, py) == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1339 strncpy(py, file, len-1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1340 py[len-1] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1341 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1342
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1343 if (stat(py, &statbuf) == 0 &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1344 S_ISREG(statbuf.st_mode)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1345 u = PyUnicode_DecodeFSDefault(py);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1346 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1347 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1348 u = PyUnicode_DecodeFSDefault(file);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1349 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1350 return u;
44583 73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	1351 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1352
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1353 /* Forward */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1354 static PyObject load_module(char , FILE , char , int, PyObject *);
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1355 static struct filedescr find_module(char , char , PyObject ,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1356 char , size_t, FILE , PyObject *);
44583 73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	1357 static struct _frozen * find_frozen(char *);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1358
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1359 /* 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	1360 REFERENCE COUNT */
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1361
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1362 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1363 load_package(char name, char pathname)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1364 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1365 PyObject m, d;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1366 PyObject *file = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1367 PyObject *path = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1368 int err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1369 char buf[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1370 FILE *fp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1371 struct filedescr *fdp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1372
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1373 m = PyImport_AddModule(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1374 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1375 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1376 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1377 PySys_WriteStderr("import %s # directory %s\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1378 name, pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1379 d = PyModule_GetDict(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1380 file = get_sourcefile(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1381 if (file == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1382 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1383 path = Py_BuildValue("[O]", file);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1384 if (path == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1385 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1386 err = PyDict_SetItemString(d, "__file__", file);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1387 if (err == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1388 err = PyDict_SetItemString(d, "__path__", path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1389 if (err != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1390 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1391 buf[0] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1392 fdp = find_module(name, "__init__", path, buf, sizeof(buf), &fp, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1393 if (fdp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1394 if (PyErr_ExceptionMatches(PyExc_ImportError)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1395 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1396 Py_INCREF(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1397 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1398 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1399 m = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1400 goto cleanup;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1401 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1402 m = load_module(name, fp, buf, fdp->type, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1403 if (fp != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1404 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1405 goto cleanup;
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	1406
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	1407 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1408 m = NULL;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1409 cleanup:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1410 Py_XDECREF(path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1411 Py_XDECREF(file);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1412 return m;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1413 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1414
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1415
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1416 /* Helper to test for built-in module */
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1417
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1418 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	1419 is_builtin(char *name)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1420 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1421 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1422 for (i = 0; PyImport_Inittab[i].name != NULL; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1423 if (strcmp(name, PyImport_Inittab[i].name) == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1424 if (PyImport_Inittab[i].initfunc == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1425 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1426 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1427 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1428 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1429 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1430 return 0;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1431 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1432
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1433
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1434 /* 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	1435 possibly by fetching it from the path_importer_cache dict. If it
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1436 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	1437 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	1438 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	1439 import mechanism. Cache the result in path_importer_cache.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1440 Returns a borrowed reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1441
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1442 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1443 get_path_importer(PyObject path_importer_cache, PyObject path_hooks,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1444 PyObject *p)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1445 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1446 PyObject *importer;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1447 Py_ssize_t j, nhooks;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1448
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1449 /* These conditions are the caller's responsibility: */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1450 assert(PyList_Check(path_hooks));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1451 assert(PyDict_Check(path_importer_cache));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1452
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1453 nhooks = PyList_Size(path_hooks);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1454 if (nhooks < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1455 return NULL; /* Shouldn't happen */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1456
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1457 importer = PyDict_GetItem(path_importer_cache, p);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1458 if (importer != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1459 return importer;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1460
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1461 /* set path_importer_cache[p] to None to avoid recursion */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1462 if (PyDict_SetItem(path_importer_cache, p, Py_None) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1463 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1464
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1465 for (j = 0; j < nhooks; j++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1466 PyObject *hook = PyList_GetItem(path_hooks, j);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1467 if (hook == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1468 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1469 importer = PyObject_CallFunctionObjArgs(hook, p, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1470 if (importer != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1471 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1472
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1473 if (!PyErr_ExceptionMatches(PyExc_ImportError)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1474 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1475 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1476 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1477 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1478 if (importer == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1479 importer = PyObject_CallFunctionObjArgs(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1480 (PyObject *)&PyNullImporter_Type, p, NULL
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1481 );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1482 if (importer == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1483 if (PyErr_ExceptionMatches(PyExc_ImportError)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1484 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1485 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1486 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1487 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1488 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1489 if (importer != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1490 int err = PyDict_SetItem(path_importer_cache, p, importer);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1491 Py_DECREF(importer);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1492 if (err != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1493 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1494 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1495 return importer;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1496 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1497
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1498 PyAPI_FUNC(PyObject *)
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1499 PyImport_GetImporter(PyObject *path) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1500 PyObject importer=NULL, path_importer_cache=NULL, *path_hooks=NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1501
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1502 if ((path_importer_cache = PySys_GetObject("path_importer_cache"))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1503 if ((path_hooks = PySys_GetObject("path_hooks"))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1504 importer = get_path_importer(path_importer_cache,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1505 path_hooks, path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1506 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1507 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1508 Py_XINCREF(importer); /* get_path_importer returns a borrowed reference */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1509 return importer;
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1510 }
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1511
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1512 /* 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	1513 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	1514 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	1515
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1516 #ifdef MS_COREDLL
13663 29da35543833 ANSIfy as many declarations as possible. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	1517 extern FILE PyWin_FindRegisteredModule(const char , struct filedescr **,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1518 char *, Py_ssize_t);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1519 #endif
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1520
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1521 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	1522 static int find_init_module(char ); / Forward */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1523 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	1524
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1525 static struct filedescr *
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1526 find_module(char fullname, char subname, PyObject path, char buf,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1527 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	1528 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1529 Py_ssize_t i, npath;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1530 size_t len, namelen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1531 struct filedescr *fdp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1532 char *filemode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1533 FILE *fp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1534 PyObject path_hooks, path_importer_cache;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1535 struct stat statbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1536 static struct filedescr fd_frozen = {"", "", PY_FROZEN};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1537 static struct filedescr fd_builtin = {"", "", C_BUILTIN};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1538 static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1539 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	1540 #if defined(PYOS_OS2)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1541 size_t saved_len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1542 size_t saved_namelen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1543 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	1544 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1545 if (p_loader != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1546 *p_loader = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1547
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1548 if (strlen(subname) > MAXPATHLEN) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1549 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1550 "module name is too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1551 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1552 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1553 strcpy(name, subname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1554
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1555 /* sys.meta_path import hook */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1556 if (p_loader != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1557 PyObject *meta_path;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1558
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1559 meta_path = PySys_GetObject("meta_path");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1560 if (meta_path == NULL \|\| !PyList_Check(meta_path)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1561 PyErr_SetString(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1562 "sys.meta_path must be a list of "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1563 "import hooks");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1564 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1565 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1566 Py_INCREF(meta_path); /* zap guard */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1567 npath = PyList_Size(meta_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1568 for (i = 0; i < npath; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1569 PyObject *loader;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1570 PyObject *hook = PyList_GetItem(meta_path, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1571 loader = PyObject_CallMethod(hook, "find_module",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1572 "sO", fullname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1573 path != NULL ?
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1574 path : Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1575 if (loader == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1576 Py_DECREF(meta_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1577 return NULL; /* true error */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1578 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1579 if (loader != Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1580 /* a loader was found */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1581 *p_loader = loader;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1582 Py_DECREF(meta_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1583 return &importhookdescr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1584 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1585 Py_DECREF(loader);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1586 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1587 Py_DECREF(meta_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1588 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1589
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1590 if (find_frozen(fullname) != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1591 strcpy(buf, fullname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1592 return &fd_frozen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1593 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1594
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1595 if (path == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1596 if (is_builtin(name)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1597 strcpy(buf, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1598 return &fd_builtin;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1599 }
4111 90216e907345 PYTHONWIN -> MS_COREDLL Guido van Rossum <guido@python.org> parents: 3964 diff changeset	1600 #ifdef MS_COREDLL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1601 fp = PyWin_FindRegisteredModule(name, &fdp, buf, buflen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1602 if (fp != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1603 *p_fp = fp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1604 return fdp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1605 }
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1606 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1607 path = PySys_GetObject("path");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1608 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1609
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1610 if (path == NULL \|\| !PyList_Check(path)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1611 PyErr_SetString(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1612 "sys.path must be a list of directory names");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1613 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1614 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1615
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1616 path_hooks = PySys_GetObject("path_hooks");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1617 if (path_hooks == NULL \|\| !PyList_Check(path_hooks)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1618 PyErr_SetString(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1619 "sys.path_hooks must be a list of "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1620 "import hooks");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1621 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1622 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1623 path_importer_cache = PySys_GetObject("path_importer_cache");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1624 if (path_importer_cache == NULL \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1625 !PyDict_Check(path_importer_cache)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1626 PyErr_SetString(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1627 "sys.path_importer_cache must be a dict");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1628 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1629 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1630
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1631 npath = PyList_Size(path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1632 namelen = strlen(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1633 for (i = 0; i < npath; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1634 PyObject *v = PyList_GetItem(path, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1635 PyObject *origv = v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1636 const char *base;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1637 Py_ssize_t size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1638 if (!v)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1639 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1640 if (PyUnicode_Check(v)) {
61597 b5ba7ea4246b Issue #8715: Create PyUnicode_EncodeFSDefault() function: Encode a Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1641 v = PyUnicode_EncodeFSDefault(v);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1642 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1643 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1644 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1645 else if (!PyBytes_Check(v))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1646 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1647 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1648 Py_INCREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1649
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1650 base = PyBytes_AS_STRING(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1651 size = PyBytes_GET_SIZE(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1652 len = size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1653 if (len + 2 + namelen + MAXSUFFIXSIZE >= buflen) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1654 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1655 continue; /* Too long */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1656 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1657 strcpy(buf, base);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1658 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1659
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1660 if (strlen(buf) != len) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1661 continue; /* v contains '\0' */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1662 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1663
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1664 /* sys.path_hooks import hook */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1665 if (p_loader != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1666 PyObject *importer;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1667
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1668 importer = get_path_importer(path_importer_cache,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1669 path_hooks, origv);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1670 if (importer == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1671 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1672 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1673 /* Note: importer is a borrowed reference */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1674 if (importer != Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1675 PyObject *loader;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1676 loader = PyObject_CallMethod(importer,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1677 "find_module",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1678 "s", fullname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1679 if (loader == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1680 return NULL; /* error */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1681 if (loader != Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1682 /* a loader was found */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1683 *p_loader = loader;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1684 return &importhookdescr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1685 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1686 Py_DECREF(loader);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1687 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1688 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1689 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1690 /* no hook was found, use builtin import */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1691
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1692 if (len > 0 && buf[len-1] != SEP
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1693 #ifdef ALTSEP
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1694 && buf[len-1] != ALTSEP
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1695 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1696 )
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1697 buf[len++] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1698 strcpy(buf+len, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1699 len += namelen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1700
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1701 /* Check for package import (buf holds a directory name,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1702 and there's an __init__ module in that directory */
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1703 #ifdef HAVE_STAT
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1704 if (stat(buf, &statbuf) == 0 && /* it exists */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1705 S_ISDIR(statbuf.st_mode) && /* it's a directory */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1706 case_ok(buf, len, namelen, name)) { /* case matches */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1707 if (find_init_module(buf)) { /* and has __init__.py */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1708 return &fd_package;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1709 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1710 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1711 char warnstr[MAXPATHLEN+80];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1712 sprintf(warnstr, "Not importing directory "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1713 "'%.*s': missing __init__.py",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1714 MAXPATHLEN, buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1715 if (PyErr_WarnEx(PyExc_ImportWarning,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1716 warnstr, 1)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1717 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1718 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1719 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1720 }
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1721 #endif
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1722 #if defined(PYOS_OS2)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1723 /* take a snapshot of the module spec for restoration
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1724 * after the 8 character DLL hackery
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1725 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1726 saved_buf = strdup(buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1727 saved_len = len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1728 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	1729 #endif /* PYOS_OS2 */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1730 for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	1731 #if defined(PYOS_OS2) && defined(HAVE_DYNAMIC_LOADING)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1732 /* OS/2 limits DLLs to 8 character names (w/o
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1733 extension)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1734 * so if the name is longer than that and its a
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1735 * dynamically loaded module we're going to try,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1736 * truncate the name before trying
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1737 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1738 if (strlen(subname) > 8) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1739 /* is this an attempt to load a C extension? */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1740 const struct filedescr *scan;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1741 scan = _PyImport_DynLoadFiletab;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1742 while (scan->suffix != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1743 if (!strcmp(scan->suffix, fdp->suffix))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1744 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1745 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1746 scan++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1747 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1748 if (scan->suffix != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1749 /* yes, so truncate the name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1750 namelen = 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1751 len -= strlen(subname) - namelen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1752 buf[len] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1753 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1754 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1755 #endif /* PYOS_OS2 */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1756 strcpy(buf+len, fdp->suffix);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1757 if (Py_VerboseFlag > 1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1758 PySys_WriteStderr("# trying %s\n", buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1759 filemode = fdp->mode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1760 if (filemode[0] == 'U')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1761 filemode = "r" PY_STDIOTEXTMODE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1762 fp = fopen(buf, filemode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1763 if (fp != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1764 if (case_ok(buf, len, namelen, name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1765 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1766 else { /* continue search */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1767 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1768 fp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1769 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1770 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1771 #if defined(PYOS_OS2)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1772 /* restore the saved snapshot */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1773 strcpy(buf, saved_buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1774 len = saved_len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1775 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	1776 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1777 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1778 #if defined(PYOS_OS2)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1779 /* don't need/want the module name snapshot anymore */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1780 if (saved_buf)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1781 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1782 free(saved_buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1783 saved_buf = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1784 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1785 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1786 if (fp != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1787 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1788 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1789 if (fp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1790 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1791 "No module named %.200s", name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1792 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1793 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1794 *p_fp = fp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1795 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	1796 }
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	1797
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1798 /* 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	1799 * 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	1800 * /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	1801 * ^ ^ ^ ^
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1802 * \|--------------------- buf ---------------------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1803 * \|------------------- len ------------------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1804 * \|------ name -------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1805 * \|----- namelen -----\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1806 * 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	1807 * 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	1808 *
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1809 * 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	1810 * 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	1811 *
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1812 * 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	1813 * 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	1814 * 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	1815 *
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1816 * 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	1817 * 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	1818 * 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	1819 * 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	1820 */
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1821
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1822 /* 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	1823 * 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	1824 */
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1825 #if defined(MS_WINDOWS)
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1826 #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	1827
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1828 #elif defined(DJGPP)
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1829 #include <dir.h>
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1830
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1831 #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	1832 #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	1833 #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	1834
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1835 #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	1836 #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	1837 #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	1838 #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	1839 #include <os2.h>
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1840 #endif
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1841
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1842 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1843 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	1844 {
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1845 /* 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	1846 * match the sequence just above.
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1847 */
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1848
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1849 /* MS_WINDOWS */
4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1850 #if defined(MS_WINDOWS)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1851 WIN32_FIND_DATA data;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1852 HANDLE h;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1853
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1854 if (Py_GETENV("PYTHONCASEOK") != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1855 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1856
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1857 h = FindFirstFile(buf, &data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1858 if (h == INVALID_HANDLE_VALUE) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1859 PyErr_Format(PyExc_NameError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1860 "Can't find file for module %.100s\n(filename %.300s)",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1861 name, buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1862 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1863 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1864 FindClose(h);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1865 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	1866
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1867 /* DJGPP */
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1868 #elif defined(DJGPP)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1869 struct ffblk ffblk;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1870 int done;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1871
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1872 if (Py_GETENV("PYTHONCASEOK") != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1873 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1874
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1875 done = findfirst(buf, &ffblk, FA_ARCH\|FA_RDONLY\|FA_HIDDEN\|FA_DIREC);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1876 if (done) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1877 PyErr_Format(PyExc_NameError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1878 "Can't find file for module %.100s\n(filename %.300s)",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1879 name, buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1880 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1881 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1882 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	1883
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1884 /* new-fangled macintosh (macosx) or Cygwin */
4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1885 #elif (defined(__MACH__) && defined(__APPLE__) \|\| defined(__CYGWIN__)) && defined(HAVE_DIRENT_H)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1886 DIR *dirp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1887 struct dirent *dp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1888 char dirname[MAXPATHLEN + 1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1889 const int dirlen = len - namelen - 1; /* don't want trailing SEP */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1890
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1891 if (Py_GETENV("PYTHONCASEOK") != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1892 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1893
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1894 /* Copy the dir component into dirname; substitute "." if empty */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1895 if (dirlen <= 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1896 dirname[0] = '.';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1897 dirname[1] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1898 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1899 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1900 assert(dirlen <= MAXPATHLEN);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1901 memcpy(dirname, buf, dirlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1902 dirname[dirlen] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1903 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1904 /* Open the directory and search the entries for an exact match. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1905 dirp = opendir(dirname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1906 if (dirp) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1907 char *nameWithExt = buf + len - namelen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1908 while ((dp = readdir(dirp)) != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1909 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	1910 #ifdef _DIRENT_HAVE_D_NAMELEN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1911 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	1912 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1913 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	1914 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1915 if (thislen >= namelen &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1916 strcmp(dp->d_name, nameWithExt) == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1917 (void)closedir(dirp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1918 return 1; /* Found */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1919 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1920 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1921 (void)closedir(dirp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1922 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1923 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	1924
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1925 /* OS/2 */
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1926 #elif defined(PYOS_OS2)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1927 HDIR hdir = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1928 ULONG srchcnt = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1929 FILEFINDBUF3 ffbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1930 APIRET rc;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1931
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1932 if (Py_GETENV("PYTHONCASEOK") != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1933 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1934
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1935 rc = DosFindFirst(buf,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1936 &hdir,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1937 FILE_READONLY \| FILE_HIDDEN \| FILE_SYSTEM \| FILE_DIRECTORY,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1938 &ffbuf, sizeof(ffbuf),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1939 &srchcnt,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1940 FIL_STANDARD);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1941 if (rc != NO_ERROR)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1942 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1943 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	1944
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1945 /* 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	1946 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1947 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	1948
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1949 #endif
7305 067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	1950 }
067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	1951
64003 d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1952 /* Call _wfopen() on Windows, or fopen() otherwise. Return the new file
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1953 object on success, or NULL if the file cannot be open or (if
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1954 PyErr_Occurred()) on unicode error */
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1955
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1956 FILE*
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1957 _Py_fopen(PyObject unicode, const char mode)
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1958 {
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1959 #ifdef MS_WINDOWS
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1960 wchar_t path[MAXPATHLEN+1];
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1961 wchar_t wmode[10];
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1962 Py_ssize_t len;
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1963 int usize;
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1964
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1965 len = PyUnicode_AsWideChar((PyUnicodeObject*)unicode, path, MAXPATHLEN);
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1966 if (len == -1)
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1967 return NULL;
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1968 path[len] = L'\0';
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1969
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1970 usize = MultiByteToWideChar(CP_ACP, 0, mode, -1, wmode, sizeof(wmode));
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1971 if (usize == 0)
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1972 return NULL;
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1973
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1974 return _wfopen(path, wmode);
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1975 #else
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1976 FILE *f;
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1977 PyObject *bytes = PyUnicode_EncodeFSDefault(unicode);
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1978 if (bytes == NULL)
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1979 return NULL;
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1980 f = fopen(PyBytes_AS_STRING(bytes), mode);
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1981 Py_DECREF(bytes);
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1982 return f;
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1983 #endif
d360311f0e52 Create _Py_fopen() for PyUnicodeObject path Victor Stinner <victor.stinner@haypocalc.com> parents: 63999 diff changeset	1984 }
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1985
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1986 #ifdef HAVE_STAT
63985 953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1987
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1988 /* Call _wstat() on Windows, or stat() otherwise. Only fill st_mode
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1989 attribute on Windows. Return 0 on success, -1 on stat error or (if
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1990 PyErr_Occurred()) unicode error. */
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1991
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1992 int
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1993 _Py_stat(PyObject unicode, struct stat statbuf)
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1994 {
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1995 #ifdef MS_WINDOWS
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1996 wchar_t path[MAXPATHLEN+1];
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1997 Py_ssize_t len;
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1998 int err;
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1999 struct _stat wstatbuf;
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2000
63999 b7220e429abb _Py_stat(): ensure that path ends with a nul character Victor Stinner <victor.stinner@haypocalc.com> parents: 63985 diff changeset	2001 len = PyUnicode_AsWideChar((PyUnicodeObject*)unicode, path, MAXPATHLEN);
63985 953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2002 if (len == -1)
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2003 return -1;
63999 b7220e429abb _Py_stat(): ensure that path ends with a nul character Victor Stinner <victor.stinner@haypocalc.com> parents: 63985 diff changeset	2004 path[len] = L'\0';
b7220e429abb _Py_stat(): ensure that path ends with a nul character Victor Stinner <victor.stinner@haypocalc.com> parents: 63985 diff changeset	2005
63985 953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2006 err = _wstat(path, &wstatbuf);
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2007 if (!err)
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2008 statbuf->st_mode = wstatbuf.st_mode;
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2009 return err;
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2010 #else
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2011 int ret;
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2012 PyObject *bytes = PyUnicode_EncodeFSDefault(unicode);
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2013 if (bytes == NULL)
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2014 return -1;
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2015 ret = stat(PyBytes_AS_STRING(bytes), statbuf);
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2016 Py_DECREF(bytes);
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2017 return ret;
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2018 #endif
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2019 }
953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2020
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2021 /* 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	2022 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2023 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	2024 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2025 const size_t save_len = strlen(buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2026 size_t i = save_len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2027 char pname; / pointer to start of __init__ */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2028 struct stat statbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2029
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2030 /* For calling case_ok(buf, len, namelen, name):
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2031 * /a/b/c/d/e/f/g/h/i/j/k/some_long_module_name.py\0
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2032 * ^ ^ ^ ^
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2033 * \|--------------------- buf ---------------------\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2034 * \|------------------- len ------------------\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2035 * \|------ name -------\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2036 * \|----- namelen -----\|
18388 06332b3c4335 SF bug #438295: [Windows] __init__.py cause strange behavior Tim Peters <tim.peters@gmail.com> parents: 17642 diff changeset	2037 */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2038 if (save_len + 13 >= MAXPATHLEN)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2039 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2040 buf[i++] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2041 pname = buf + i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2042 strcpy(pname, "__init__.py");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2043 if (stat(buf, &statbuf) == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2044 if (case_ok(buf,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2045 save_len + 9, /* len("/__init__") */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2046 8, /* len("__init__") */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2047 pname)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2048 buf[save_len] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2049 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2050 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2051 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2052 i += strlen(pname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2053 strcpy(buf+i, Py_OptimizeFlag ? "o" : "c");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2054 if (stat(buf, &statbuf) == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2055 if (case_ok(buf,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2056 save_len + 9, /* len("/__init__") */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2057 8, /* len("__init__") */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2058 pname)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2059 buf[save_len] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2060 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2061 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2062 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2063 buf[save_len] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2064 return 0;
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2065 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	2066
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2067 #endif /* HAVE_STAT */
62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2068
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	2069
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	2070 static int init_builtin(char ); / Forward */
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2071
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2072 static PyObject*
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2073 load_builtin(char name, char pathname, int type)
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2074 {
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2075 PyObject m, modules;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2076 int err;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2077
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2078 if (pathname != NULL && pathname[0] != '\0')
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2079 name = pathname;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2080
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2081 if (type == C_BUILTIN)
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2082 err = init_builtin(name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2083 else
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2084 err = PyImport_ImportFrozenModule(name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2085 if (err < 0)
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2086 return NULL;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2087 if (err == 0) {
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2088 PyErr_Format(PyExc_ImportError,
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2089 "Purported %s module %.200s not found",
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2090 type == C_BUILTIN ?
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2091 "builtin" : "frozen",
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2092 name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2093 return NULL;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2094 }
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2095
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2096 modules = PyImport_GetModuleDict();
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2097 m = PyDict_GetItemString(modules, name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2098 if (m == NULL) {
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2099 PyErr_Format(
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2100 PyExc_ImportError,
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2101 "%s module %.200s not properly initialized",
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2102 type == C_BUILTIN ?
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2103 "builtin" : "frozen",
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2104 name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2105 return NULL;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2106 }
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2107 Py_INCREF(m);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2108 return m;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2109 }
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2110
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2111 /* 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	2112 its module object WITH INCREMENTED REFERENCE COUNT */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	2113
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2114 static PyObject *
55504 3e0ce94c2e1e Merged revisions 74075,74187,74197,74201,74216,74225 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 55304 diff changeset	2115 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	2116 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2117 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2118
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2119 /* First check that there's an open file (if we need one) */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2120 switch (type) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2121 case PY_SOURCE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2122 case PY_COMPILED:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2123 if (fp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2124 PyErr_Format(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2125 "file object required for import (type code %d)",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2126 type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2127 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2128 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2129 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2130
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2131 switch (type) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2132
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2133 case PY_SOURCE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2134 m = load_source_module(name, pathname, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2135 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2136
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2137 case PY_COMPILED:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2138 m = load_compiled_module(name, pathname, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2139 break;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2140
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2141 #ifdef HAVE_DYNAMIC_LOADING
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2142 case C_EXTENSION:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2143 m = _PyImport_LoadDynamicModule(name, pathname, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2144 break;
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2145 #endif
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2146
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2147 case PKG_DIRECTORY:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2148 m = load_package(name, pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2149 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2150
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2151 case C_BUILTIN:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2152 case PY_FROZEN:
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2153 m = load_builtin(name, pathname, type);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2154 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2155
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2156 case IMP_HOOK: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2157 if (loader == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2158 PyErr_SetString(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2159 "import hook without loader");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2160 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2161 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2162 m = PyObject_CallMethod(loader, "load_module", "s", name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2163 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2164 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2165
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2166 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2167 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2168 "Don't know how to import %.200s (type code %d)",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2169 name, type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2170 m = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2171
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2172 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2173
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2174 return m;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2175 }
40 f28ac7f621c7 Added reload() functionality. Guido van Rossum <guido@python.org> parents: 6 diff changeset	2176
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	2177
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2178 /* Initialize a built-in module.
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2179 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	2180 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	2181
bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	2182 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2183 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	2184 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2185 struct _inittab *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2186
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2187 if (_PyImport_FindExtension(name, name) != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2188 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2189
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2190 for (p = PyImport_Inittab; p->name != NULL; p++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2191 PyObject *mod;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2192 if (strcmp(name, p->name) == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2193 if (p->initfunc == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2194 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2195 "Cannot re-init internal module %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2196 name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2197 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2198 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2199 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2200 PySys_WriteStderr("import %s # builtin\n", name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2201 mod = (*p->initfunc)();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2202 if (mod == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2203 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2204 if (_PyImport_FixupExtension(mod, name, name) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2205 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2206 /* FixupExtension has put the module into sys.modules,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2207 so we can release our own reference. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2208 Py_DECREF(mod);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2209 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2210 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2211 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2212 return 0;
141 bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	2213 }
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2214
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2215
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2216 /* 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	2217
3683 ec39264311ff struct frozen is now struct _frozen and comes from import.h. Guido van Rossum <guido@python.org> parents: 3590 diff changeset	2218 static struct _frozen *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2219 find_frozen(char *name)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2220 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2221 struct _frozen *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2222
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2223 if (!name)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2224 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2225
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2226 for (p = PyImport_FrozenModules; ; p++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2227 if (p->name == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2228 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2229 if (strcmp(p->name, name) == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2230 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2231 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2232 return p;
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2233 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2234
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2235 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2236 get_frozen_object(char *name)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2237 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2238 struct _frozen *p = find_frozen(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2239 int size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2240
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2241 if (p == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2242 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2243 "No such frozen object named %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2244 name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2245 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2246 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2247 if (p->code == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2248 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2249 "Excluded frozen object named %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2250 name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2251 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2252 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2253 size = p->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2254 if (size < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2255 size = -size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2256 return PyMarshal_ReadObjectFromString((char *)p->code, size);
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2257 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2258
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2259 static PyObject *
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2260 is_frozen_package(char *name)
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2261 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2262 struct _frozen *p = find_frozen(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2263 int size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2264
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2265 if (p == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2266 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2267 "No such frozen object named %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2268 name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2269 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2270 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2271
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2272 size = p->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2273
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2274 if (size < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2275 Py_RETURN_TRUE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2276 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2277 Py_RETURN_FALSE;
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2278 }
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2279
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2280
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2281 /* Initialize a frozen module.
52073 56983cfdf5d4 Fix a typo in a comment. Brett Cannon <bcannon@gmail.com> parents: 51996 diff changeset	2282 Return 1 for success, 0 if the module is not found, and -1 with
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2283 an exception set if the initialization failed.
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2284 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	2285
6263e2fd9398 init_frozen non-static, frozenmain.c not in Makefile any more Guido van Rossum <guido@python.org> parents: 2270 diff changeset	2286 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2287 PyImport_ImportFrozenModule(char *name)
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2288 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2289 struct _frozen *p = find_frozen(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2290 PyObject *co;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2291 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2292 int ispackage;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2293 int size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2294
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2295 if (p == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2296 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2297 if (p->code == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2298 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2299 "Excluded frozen object named %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2300 name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2301 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2302 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2303 size = p->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2304 ispackage = (size < 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2305 if (ispackage)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2306 size = -size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2307 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2308 PySys_WriteStderr("import %s # frozen%s\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2309 name, ispackage ? " package" : "");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2310 co = PyMarshal_ReadObjectFromString((char *)p->code, size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2311 if (co == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2312 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2313 if (!PyCode_Check(co)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2314 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2315 "frozen object %.200s is not a code object",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2316 name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2317 goto err_return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2318 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2319 if (ispackage) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2320 /* Set __path__ to the package name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2321 PyObject d, s, *l;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2322 int err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2323 m = PyImport_AddModule(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2324 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2325 goto err_return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2326 d = PyModule_GetDict(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2327 s = PyUnicode_InternFromString(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2328 if (s == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2329 goto err_return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2330 l = PyList_New(1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2331 if (l == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2332 Py_DECREF(s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2333 goto err_return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2334 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2335 PyList_SET_ITEM(l, 0, s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2336 err = PyDict_SetItemString(d, "__path__", l);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2337 Py_DECREF(l);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2338 if (err != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2339 goto err_return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2340 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2341 m = PyImport_ExecCodeModuleEx(name, co, "<frozen>");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2342 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2343 goto err_return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2344 Py_DECREF(co);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2345 Py_DECREF(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2346 return 1;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2347 err_return:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2348 Py_DECREF(co);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2349 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	2350 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2351
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2352
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2353 /* 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	2354 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	2355
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2356 PyObject *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35757 diff changeset	2357 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	2358 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2359 PyObject *pname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2360 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2361
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2362 pname = PyUnicode_FromString(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2363 if (pname == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2364 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2365 result = PyImport_Import(pname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2366 Py_DECREF(pname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2367 return result;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2368 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2369
44441 b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2370 /* Import a module without blocking
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2371 *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2372 * At first it tries to fetch the module from sys.modules. If the module was
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2373 * never loaded before it loads it with PyImport_ImportModule() unless another
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2374 * thread holds the import lock. In the latter case the function raises an
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2375 * ImportError instead of blocking.
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2376 *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2377 * Returns the module object with incremented ref count.
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2378 */
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2379 PyObject *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2380 PyImport_ImportModuleNoBlock(const char *name)
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2381 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2382 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2383 PyObject *modules;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2384 long me;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2385
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2386 /* Try to get the module from sys.modules[name] */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2387 modules = PyImport_GetModuleDict();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2388 if (modules == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2389 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2390
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2391 result = PyDict_GetItemString(modules, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2392 if (result != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2393 Py_INCREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2394 return result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2395 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2396 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2397 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2398 }
48946 3b9608118f8d Merged revisions 66045,66048-66049,66053,66060,66062-66063,66065,66067,66071-66074,66080,66082-66083,66090-66093,66097-66099,66103,66105,66110,66118 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	2399 #ifdef WITH_THREAD
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2400 /* check the import lock
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2401 * me might be -1 but I ignore the error here, the lock function
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2402 * takes care of the problem */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2403 me = PyThread_get_thread_ident();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2404 if (import_lock_thread == -1 \|\| import_lock_thread == me) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2405 /* no thread or me is holding the lock */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2406 return PyImport_ImportModule(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2407 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2408 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2409 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2410 "Failed to import %.200s because the import lock"
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2411 "is held by another thread.",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2412 name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2413 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2414 }
48946 3b9608118f8d Merged revisions 66045,66048-66049,66053,66060,66062-66063,66065,66067,66071-66074,66080,66082-66083,66090-66093,66097-66099,66103,66105,66110,66118 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	2415 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2416 return PyImport_ImportModule(name);
48946 3b9608118f8d Merged revisions 66045,66048-66049,66053,66060,66062-66063,66065,66067,66071-66074,66080,66082-66083,66090-66093,66097-66099,66103,66105,66110,66118 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	2417 #endif
44441 b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2418 }
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2419
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	2420 /* 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	2421 static PyObject get_parent(PyObject globals, char *buf,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2422 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	2423 static PyObject load_next(PyObject mod, PyObject *altmod,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2424 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	2425 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	2426 static int ensure_fromlist(PyObject mod, PyObject fromlist,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2427 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	2428 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	2429
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	2430 /* 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	2431
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	2432 static PyObject *
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2433 import_module_level(char name, PyObject globals, PyObject *locals,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2434 PyObject *fromlist, int level)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2435 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2436 char buf[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2437 Py_ssize_t buflen = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2438 PyObject parent, head, next, tail;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2439
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2440 if (strchr(name, '/') != NULL
44617 a29adc3b0f26 Merged revisions 59864-59882 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	2441 #ifdef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2442 \|\| strchr(name, '\\') != NULL
44617 a29adc3b0f26 Merged revisions 59864-59882 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	2443 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2444 ) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2445 PyErr_SetString(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2446 "Import by filename is not supported.");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2447 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2448 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2449
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2450 parent = get_parent(globals, buf, &buflen, level);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2451 if (parent == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2452 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2453
62570 32651ee779ed Merged revisions 81380 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 62385 diff changeset	2454 head = load_next(parent, level < 0 ? Py_None : parent, &name, buf,
32651ee779ed Merged revisions 81380 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 62385 diff changeset	2455 &buflen);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2456 if (head == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2457 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2458
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2459 tail = head;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2460 Py_INCREF(tail);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2461 while (name) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2462 next = load_next(tail, tail, &name, buf, &buflen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2463 Py_DECREF(tail);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2464 if (next == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2465 Py_DECREF(head);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2466 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2467 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2468 tail = next;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2469 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2470 if (tail == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2471 /* If tail is Py_None, both get_parent and load_next found
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2472 an empty module name: someone called __import__("") or
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2473 doctored faulty bytecode */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2474 Py_DECREF(tail);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2475 Py_DECREF(head);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2476 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2477 "Empty module name");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2478 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2479 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2480
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2481 if (fromlist != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2482 if (fromlist == Py_None \|\| !PyObject_IsTrue(fromlist))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2483 fromlist = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2484 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2485
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2486 if (fromlist == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2487 Py_DECREF(tail);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2488 return head;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2489 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2490
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2491 Py_DECREF(head);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2492 if (!ensure_fromlist(tail, fromlist, buf, buflen, 0)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2493 Py_DECREF(tail);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2494 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2495 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2496
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2497 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	2498 }
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	2499
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2500 PyObject *
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2501 PyImport_ImportModuleLevel(char name, PyObject globals, PyObject *locals,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2502 PyObject *fromlist, int level)
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2503 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2504 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2505 _PyImport_AcquireLock();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2506 result = import_module_level(name, globals, locals, fromlist, level);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2507 if (_PyImport_ReleaseLock() < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2508 Py_XDECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2509 PyErr_SetString(PyExc_RuntimeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2510 "not holding the import lock");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2511 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2512 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2513 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	2514 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	2515
32156 56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2516 /* 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	2517 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	2518 sys.modules entry for foo.bar. If globals is from a package's __init__.py,
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2519 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	2520
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2521 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	2522 the name in *p_buflen.
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2523
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2524 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	2525 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	2526 */
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	2527 static PyObject *
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2528 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	2529 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2530 static PyObject *namestr = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2531 static PyObject *pathstr = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2532 static PyObject *pkgstr = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2533 PyObject pkgname, modname, modpath, modules, *parent;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2534 int orig_level = level;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2535
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2536 if (globals == NULL \|\| !PyDict_Check(globals) \|\| !level)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2537 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2538
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2539 if (namestr == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2540 namestr = PyUnicode_InternFromString("__name__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2541 if (namestr == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2542 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2543 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2544 if (pathstr == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2545 pathstr = PyUnicode_InternFromString("__path__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2546 if (pathstr == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2547 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2548 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2549 if (pkgstr == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2550 pkgstr = PyUnicode_InternFromString("__package__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2551 if (pkgstr == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2552 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2553 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2554
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2555 *buf = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2556 *p_buflen = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2557 pkgname = PyDict_GetItem(globals, pkgstr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2558
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2559 if ((pkgname != NULL) && (pkgname != Py_None)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2560 /* __package__ is set, so use it */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2561 char *pkgname_str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2562 Py_ssize_t len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2563
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2564 if (!PyUnicode_Check(pkgname)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2565 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2566 "__package__ set to non-string");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2567 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2568 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2569 pkgname_str = _PyUnicode_AsStringAndSize(pkgname, &len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2570 if (len == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2571 if (level > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2572 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2573 "Attempted relative import in non-package");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2574 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2575 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2576 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2577 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2578 if (len > MAXPATHLEN) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2579 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2580 "Package name too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2581 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2582 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2583 strcpy(buf, pkgname_str);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2584 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2585 /* __package__ not set, so figure it out and set it */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2586 modname = PyDict_GetItem(globals, namestr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2587 if (modname == NULL \|\| !PyUnicode_Check(modname))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2588 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2589
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2590 modpath = PyDict_GetItem(globals, pathstr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2591 if (modpath != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2592 /* __path__ is set, so modname is already the package name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2593 char *modname_str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2594 Py_ssize_t len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2595 int error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2596
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2597 modname_str = _PyUnicode_AsStringAndSize(modname, &len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2598 if (len > MAXPATHLEN) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2599 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2600 "Module name too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2601 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2602 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2603 strcpy(buf, modname_str);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2604 error = PyDict_SetItem(globals, pkgstr, modname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2605 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2606 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2607 "Could not set __package__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2608 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2609 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2610 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2611 /* Normal module, so work out the package name if any */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2612 char *start = _PyUnicode_AsString(modname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2613 char *lastdot = strrchr(start, '.');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2614 size_t len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2615 int error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2616 if (lastdot == NULL && level > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2617 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2618 "Attempted relative import in non-package");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2619 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2620 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2621 if (lastdot == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2622 error = PyDict_SetItem(globals, pkgstr, Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2623 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2624 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2625 "Could not set __package__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2626 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2627 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2628 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2629 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2630 len = lastdot - start;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2631 if (len >= MAXPATHLEN) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2632 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2633 "Module name too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2634 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2635 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2636 strncpy(buf, start, len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2637 buf[len] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2638 pkgname = PyUnicode_FromString(buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2639 if (pkgname == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2640 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2641 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2642 error = PyDict_SetItem(globals, pkgstr, pkgname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2643 Py_DECREF(pkgname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2644 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2645 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2646 "Could not set __package__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2647 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2648 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2649 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2650 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2651 while (--level > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2652 char *dot = strrchr(buf, '.');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2653 if (dot == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2654 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2655 "Attempted relative import beyond "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2656 "toplevel package");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2657 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2658 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2659 *dot = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2660 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2661 *p_buflen = strlen(buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2662
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2663 modules = PyImport_GetModuleDict();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2664 parent = PyDict_GetItemString(modules, buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2665 if (parent == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2666 if (orig_level < 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2667 PyObject *err_msg = PyBytes_FromFormat(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2668 "Parent module '%.200s' not found "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2669 "while handling absolute import", buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2670 if (err_msg == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2671 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2672 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2673 if (!PyErr_WarnEx(PyExc_RuntimeWarning,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2674 PyBytes_AsString(err_msg), 1)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2675 *buf = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2676 *p_buflen = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2677 parent = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2678 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2679 Py_DECREF(err_msg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2680 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2681 PyErr_Format(PyExc_SystemError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2682 "Parent module '%.200s' not loaded, "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2683 "cannot perform relative import", buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2684 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2685 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2686 return parent;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2687 /* We expect, but can't guarantee, if parent != None, that:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2688 - parent.__name__ == buf
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2689 - parent.__dict__ is globals
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2690 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	2691 }
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	2692
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2693 /* 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	2694 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2695 load_next(PyObject mod, PyObject altmod, char *p_name, char buf,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2696 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	2697 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2698 char name = p_name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2699 char *dot = strchr(name, '.');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2700 size_t len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2701 char *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2702 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2703
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2704 if (strlen(name) == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2705 /* completely empty module name should only happen in
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2706 'from . import' (or '__import__("")')*/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2707 Py_INCREF(mod);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2708 *p_name = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2709 return mod;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2710 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2711
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2712 if (dot == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2713 *p_name = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2714 len = strlen(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2715 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2716 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2717 *p_name = dot+1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2718 len = dot-name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2719 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2720 if (len == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2721 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2722 "Empty module name");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2723 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2724 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2725
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2726 p = buf + *p_buflen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2727 if (p != buf)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2728 *p++ = '.';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2729 if (p+len-buf >= MAXPATHLEN) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2730 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2731 "Module name too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2732 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2733 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2734 strncpy(p, name, len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2735 p[len] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2736 *p_buflen = p+len-buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2737
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2738 result = import_submodule(mod, p, buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2739 if (result == Py_None && altmod != mod) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2740 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2741 /* Here, altmod must be None and mod must not be None */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2742 result = import_submodule(altmod, p, p);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2743 if (result != NULL && result != Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2744 if (mark_miss(buf) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2745 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2746 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2747 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2748 strncpy(buf, name, len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2749 buf[len] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2750 *p_buflen = len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2751 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2752 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2753 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2754 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2755
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2756 if (result == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2757 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2758 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2759 "No module named %.200s", name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2760 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2761 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2762
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2763 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	2764 }
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	2765
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	2766 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2767 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	2768 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2769 PyObject *modules = PyImport_GetModuleDict();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2770 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	2771 }
6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	2772
6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	2773 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	2774 ensure_fromlist(PyObject mod, PyObject fromlist, char *buf, Py_ssize_t buflen,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2775 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	2776 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2777 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2778
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2779 if (!PyObject_HasAttrString(mod, "__path__"))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2780 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2781
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2782 for (i = 0; ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2783 PyObject *item = PySequence_GetItem(fromlist, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2784 int hasit;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2785 if (item == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2786 if (PyErr_ExceptionMatches(PyExc_IndexError)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2787 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2788 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2789 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2790 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2791 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2792 if (!PyUnicode_Check(item)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2793 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2794 "Item in ``from list'' not a string");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2795 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2796 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2797 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2798 if (PyUnicode_AS_UNICODE(item)[0] == '*') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2799 PyObject *all;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2800 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2801 /* See if the package defines __all__ */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2802 if (recursive)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2803 continue; /* Avoid endless recursion */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2804 all = PyObject_GetAttrString(mod, "__all__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2805 if (all == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2806 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2807 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2808 int ret = ensure_fromlist(mod, all, buf, buflen, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2809 Py_DECREF(all);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2810 if (!ret)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2811 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2812 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2813 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2814 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2815 hasit = PyObject_HasAttr(mod, item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2816 if (!hasit) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2817 PyObject *item8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2818 char *subname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2819 PyObject *submod;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2820 char *p;
61597 b5ba7ea4246b Issue #8715: Create PyUnicode_EncodeFSDefault() function: Encode a Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	2821 item8 = PyUnicode_EncodeFSDefault(item);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2822 if (!item8) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2823 PyErr_SetString(PyExc_ValueError, "Cannot encode path item");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2824 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2825 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2826 subname = PyBytes_AS_STRING(item8);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2827 if (buflen + strlen(subname) >= MAXPATHLEN) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2828 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2829 "Module name too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2830 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2831 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2832 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2833 p = buf + buflen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2834 *p++ = '.';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2835 strcpy(p, subname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2836 submod = import_submodule(mod, subname, buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2837 Py_DECREF(item8);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2838 Py_XDECREF(submod);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2839 if (submod == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2840 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2841 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2842 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2843 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2844 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2845 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2846
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2847 /* 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	2848 }
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	2849
29501 6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	2850 static int
6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	2851 add_submodule(PyObject mod, PyObject submod, char fullname, char subname,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2852 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	2853 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2854 if (mod == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2855 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2856 /* Irrespective of the success of this load, make a
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2857 reference to it in the parent package module. A copy gets
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2858 saved in the modules dictionary under the full name, so get a
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2859 reference from there, if need be. (The exception is when the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2860 load failed with a SyntaxError -- then there's no trace in
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2861 sys.modules. In that case, of course, do nothing extra.) */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2862 if (submod == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2863 submod = PyDict_GetItemString(modules, fullname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2864 if (submod == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2865 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2866 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2867 if (PyModule_Check(mod)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2868 /* We can't use setattr here since it can give a
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2869 * spurious warning if the submodule name shadows a
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2870 * builtin name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2871 PyObject *dict = PyModule_GetDict(mod);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2872 if (!dict)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2873 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2874 if (PyDict_SetItemString(dict, subname, submod) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2875 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2876 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2877 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2878 if (PyObject_SetAttrString(mod, subname, submod) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2879 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2880 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2881 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	2882 }
6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	2883
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	2884 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2885 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	2886 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2887 PyObject *modules = PyImport_GetModuleDict();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2888 PyObject *m = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2889
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2890 /* Require:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2891 if mod == None: subname == fullname
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2892 else: mod.__name__ + "." + subname == fullname
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2893 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2894
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2895 if ((m = PyDict_GetItemString(modules, fullname)) != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2896 Py_INCREF(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2897 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2898 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2899 PyObject path, loader = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2900 char buf[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2901 struct filedescr *fdp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2902 FILE *fp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2903
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2904 if (mod == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2905 path = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2906 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2907 path = PyObject_GetAttrString(mod, "__path__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2908 if (path == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2909 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2910 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2911 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2912 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2913 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2914
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2915 buf[0] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2916 fdp = find_module(fullname, subname, path, buf, MAXPATHLEN+1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2917 &fp, &loader);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2918 Py_XDECREF(path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2919 if (fdp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2920 if (!PyErr_ExceptionMatches(PyExc_ImportError))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2921 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2922 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2923 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2924 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2925 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2926 m = load_module(fullname, fp, buf, fdp->type, loader);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2927 Py_XDECREF(loader);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2928 if (fp)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2929 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2930 if (!add_submodule(mod, m, fullname, subname, modules)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2931 Py_XDECREF(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2932 m = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2933 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2934 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2935
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2936 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	2937 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2938
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2939
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2940 /* 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	2941 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	2942
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2943 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2944 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	2945 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2946 PyInterpreterState *interp = PyThreadState_Get()->interp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2947 PyObject *modules_reloading = interp->modules_reloading;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2948 PyObject *modules = PyImport_GetModuleDict();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2949 PyObject path = NULL, loader = NULL, *existing_m = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2950 char name, subname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2951 char buf[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2952 struct filedescr *fdp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2953 FILE *fp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2954 PyObject *newm;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2955
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2956 if (modules_reloading == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2957 Py_FatalError("PyImport_ReloadModule: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2958 "no modules_reloading dictionary!");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2959 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2960 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2961
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2962 if (m == NULL \|\| !PyModule_Check(m)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2963 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2964 "reload() argument must be module");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2965 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2966 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2967 name = (char*)PyModule_GetName(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2968 if (name == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2969 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2970 if (m != PyDict_GetItemString(modules, name)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2971 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2972 "reload(): module %.200s not in sys.modules",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2973 name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2974 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2975 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2976 existing_m = PyDict_GetItemString(modules_reloading, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2977 if (existing_m != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2978 /* Due to a recursive reload, this module is already
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2979 being reloaded. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2980 Py_INCREF(existing_m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2981 return existing_m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2982 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2983 if (PyDict_SetItemString(modules_reloading, name, m) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2984 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2985
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2986 subname = strrchr(name, '.');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2987 if (subname == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2988 subname = name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2989 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2990 PyObject parentname, parent;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2991 parentname = PyUnicode_FromStringAndSize(name, (subname-name));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2992 if (parentname == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2993 imp_modules_reloading_clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2994 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2995 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2996 parent = PyDict_GetItem(modules, parentname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2997 if (parent == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2998 PyErr_Format(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2999 "reload(): parent %U not in sys.modules",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3000 parentname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3001 Py_DECREF(parentname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3002 imp_modules_reloading_clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3003 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3004 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3005 Py_DECREF(parentname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3006 subname++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3007 path = PyObject_GetAttrString(parent, "__path__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3008 if (path == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3009 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3010 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3011 buf[0] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3012 fdp = find_module(name, subname, path, buf, MAXPATHLEN+1, &fp, &loader);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3013 Py_XDECREF(path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3014
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3015 if (fdp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3016 Py_XDECREF(loader);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3017 imp_modules_reloading_clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3018 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3019 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3020
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3021 newm = load_module(name, fp, buf, fdp->type, loader);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3022 Py_XDECREF(loader);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3023
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3024 if (fp)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3025 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3026 if (newm == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3027 /* load_module probably removed name from modules because of
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3028 * the error. Put back the original module object. We're
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3029 * going to return NULL in this case regardless of whether
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3030 * replacing name succeeds, so the return value is ignored.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3031 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3032 PyDict_SetItemString(modules, name, m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3033 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3034 imp_modules_reloading_clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3035 return newm;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3036 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3037
d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3038
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3039 /* 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	3040 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	3041 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	3042 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	3043 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	3044 A dummy list ["__doc__"] is passed as the 4th argument so that
42862 ed1594a16bdb Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42859 diff changeset	3045 e.g. PyImport_Import(PyUnicode_FromString("win32com.client.gencache"))
9680 8b61e1273b4b Improve comment for PyImport_Import() as suggested by Bill Tutt. Guido van Rossum <guido@python.org> parents: 9679 diff changeset	3046 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	3047
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3048 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3049 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	3050 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3051 static PyObject *silly_list = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3052 static PyObject *builtins_str = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3053 static PyObject *import_str = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3054 PyObject *globals = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3055 PyObject *import = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3056 PyObject *builtins = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3057 PyObject *r = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3058
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3059 /* Initialize constant string objects */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3060 if (silly_list == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3061 import_str = PyUnicode_InternFromString("__import__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3062 if (import_str == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3063 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3064 builtins_str = PyUnicode_InternFromString("__builtins__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3065 if (builtins_str == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3066 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3067 silly_list = Py_BuildValue("[s]", "__doc__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3068 if (silly_list == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3069 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3070 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3071
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3072 /* Get the builtins from current globals */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3073 globals = PyEval_GetGlobals();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3074 if (globals != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3075 Py_INCREF(globals);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3076 builtins = PyObject_GetItem(globals, builtins_str);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3077 if (builtins == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3078 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3079 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3080 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3081 /* No globals -- use standard builtins, and fake globals */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3082 builtins = PyImport_ImportModuleLevel("builtins",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3083 NULL, NULL, NULL, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3084 if (builtins == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3085 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3086 globals = Py_BuildValue("{OO}", builtins_str, builtins);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3087 if (globals == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3088 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3089 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3090
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3091 /* Get the __import__ function from the builtins */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3092 if (PyDict_Check(builtins)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3093 import = PyObject_GetItem(builtins, import_str);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3094 if (import == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3095 PyErr_SetObject(PyExc_KeyError, import_str);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3096 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3097 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3098 import = PyObject_GetAttr(builtins, import_str);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3099 if (import == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3100 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3101
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3102 /* Call the __import__ function with the proper argument list
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3103 * Always use absolute import here. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3104 r = PyObject_CallFunction(import, "OOOOi", module_name, globals,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3105 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	3106
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3107 err:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3108 Py_XDECREF(globals);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3109 Py_XDECREF(builtins);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3110 Py_XDECREF(import);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3111
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3112 return r;
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3113 }
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3114
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3115
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3116 /* 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	3117 importing modules.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3118 */
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3119
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3120 static PyObject *
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3121 imp_make_magic(long magic)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3122 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3123 char buf[4];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3124
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3125 buf[0] = (char) ((magic >> 0) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3126 buf[1] = (char) ((magic >> 8) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3127 buf[2] = (char) ((magic >> 16) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3128 buf[3] = (char) ((magic >> 24) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3129
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3130 return PyBytes_FromStringAndSize(buf, 4);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3131 };
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3132
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3133 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3134 imp_get_magic(PyObject self, PyObject noargs)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3135 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3136 return imp_make_magic(pyc_magic);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3137 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3138
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3139 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3140 imp_get_tag(PyObject self, PyObject noargs)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3141 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3142 return PyUnicode_FromString(pyc_tag);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3143 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3144
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3145 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	3146 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	3147 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3148 PyObject *list;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3149 struct filedescr *fdp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3150
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3151 list = PyList_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3152 if (list == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3153 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3154 for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3155 PyObject *item = Py_BuildValue("ssi",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3156 fdp->suffix, fdp->mode, fdp->type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3157 if (item == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3158 Py_DECREF(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3159 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3160 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3161 if (PyList_Append(list, item) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3162 Py_DECREF(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3163 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3164 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3165 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3166 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3167 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3168 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	3169 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3170
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3171 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3172 call_find_module(char name, PyObject path)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3173 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3174 extern int fclose(FILE *);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3175 PyObject fob, ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3176 PyObject *pathobj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3177 struct filedescr *fdp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3178 char pathname[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3179 FILE *fp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3180 int fd = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3181 char *found_encoding = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3182 char *encoding = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3183
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3184 pathname[0] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3185 if (path == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3186 path = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3187 fdp = find_module(NULL, name, path, pathname, MAXPATHLEN+1, &fp, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3188 if (fdp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3189 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3190 if (fp != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3191 fd = fileno(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3192 if (fd != -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3193 fd = dup(fd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3194 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3195 fp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3196 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3197 if (fd != -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3198 if (strchr(fdp->mode, 'b') == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3199 /* PyTokenizer_FindEncoding() returns PyMem_MALLOC'ed
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3200 memory. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3201 found_encoding = PyTokenizer_FindEncoding(fd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3202 lseek(fd, 0, 0); /* Reset position */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3203 if (found_encoding == NULL && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3204 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3205 encoding = (found_encoding != NULL) ? found_encoding :
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3206 (char*)PyUnicode_GetDefaultEncoding();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3207 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3208 fob = PyFile_FromFd(fd, pathname, fdp->mode, -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3209 (char*)encoding, NULL, NULL, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3210 if (fob == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3211 close(fd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3212 PyMem_FREE(found_encoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3213 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3214 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3215 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3216 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3217 fob = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3218 Py_INCREF(fob);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3219 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3220 pathobj = PyUnicode_DecodeFSDefault(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3221 ret = Py_BuildValue("NN(ssi)",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3222 fob, pathobj, fdp->suffix, fdp->mode, fdp->type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3223 PyMem_FREE(found_encoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3224
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3225 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3226 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3227
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3228 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3229 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	3230 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3231 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3232 PyObject ret, path = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3233 if (!PyArg_ParseTuple(args, "es\|O:find_module",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3234 Py_FileSystemDefaultEncoding, &name,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3235 &path))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3236 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3237 ret = call_find_module(name, path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3238 PyMem_Free(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3239 return ret;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3240 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3241
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3242 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3243 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	3244 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3245 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3246 int ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3247 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3248 if (!PyArg_ParseTuple(args, "s:init_builtin", &name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3249 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3250 ret = init_builtin(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3251 if (ret < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3252 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3253 if (ret == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3254 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3255 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3256 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3257 m = PyImport_AddModule(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3258 Py_XINCREF(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3259 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	3260 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3261
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3262 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3263 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	3264 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3265 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3266 int ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3267 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3268 if (!PyArg_ParseTuple(args, "s:init_frozen", &name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3269 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3270 ret = PyImport_ImportFrozenModule(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3271 if (ret < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3272 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3273 if (ret == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3274 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3275 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3276 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3277 m = PyImport_AddModule(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3278 Py_XINCREF(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3279 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	3280 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3281
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3282 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3283 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	3284 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3285 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3286
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3287 if (!PyArg_ParseTuple(args, "s:get_frozen_object", &name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3288 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3289 return get_frozen_object(name);
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	3290 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	3291
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3292 static PyObject *
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3293 imp_is_frozen_package(PyObject self, PyObject args)
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3294 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3295 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3296
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3297 if (!PyArg_ParseTuple(args, "s:is_frozen_package", &name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3298 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3299 return is_frozen_package(name);
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3300 }
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3301
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3302 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3303 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	3304 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3305 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3306 if (!PyArg_ParseTuple(args, "s:is_builtin", &name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3307 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3308 return PyLong_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	3309 }
d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3310
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3311 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3312 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	3313 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3314 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3315 struct _frozen *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3316 if (!PyArg_ParseTuple(args, "s:is_frozen", &name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3317 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3318 p = find_frozen(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3319 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	3320 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3321
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3322 static FILE *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3323 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	3324 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3325 FILE *fp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3326 if (mode[0] == 'U')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3327 mode = "r" PY_STDIOTEXTMODE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3328 if (fob == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3329 fp = fopen(pathname, mode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3330 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3331 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3332 int fd = PyObject_AsFileDescriptor(fob);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3333 if (fd == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3334 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3335 if (!_PyVerify_fd(fd))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3336 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3337 /* the FILE struct gets a new fd, so that it can be closed
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3338 * independently of the file descriptor given
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3339 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3340 fd = dup(fd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3341 if (fd == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3342 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3343 fp = fdopen(fd, mode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3344 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3345 if (fp)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3346 return fp;
52545 2d80c2797501 get_file() no longer leaks a FILE structure. If given a file descriptor, it calls dup() to get a new handle. Then both the FILE object and the fd can be closed. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 52480 diff changeset	3347 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3348 PyErr_SetFromErrno(PyExc_IOError);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3349 return NULL;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3350 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3351
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3352 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3353 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	3354 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3355 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3356 char *pathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3357 PyObject *fob = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3358 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3359 FILE *fp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3360 if (!PyArg_ParseTuple(args, "ses\|O:load_compiled",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3361 &name,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3362 Py_FileSystemDefaultEncoding, &pathname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3363 &fob))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3364 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3365 fp = get_file(pathname, fob, "rb");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3366 if (fp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3367 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3368 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3369 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3370 m = load_compiled_module(name, pathname, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3371 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3372 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3373 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	3374 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3375
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3376 #ifdef HAVE_DYNAMIC_LOADING
528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3377
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3378 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3379 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	3380 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3381 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3382 char *pathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3383 PyObject *fob = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3384 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3385 FILE *fp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3386 if (!PyArg_ParseTuple(args, "ses\|O:load_dynamic",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3387 &name,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3388 Py_FileSystemDefaultEncoding, &pathname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3389 &fob))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3390 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3391 if (fob) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3392 fp = get_file(pathname, fob, "r");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3393 if (fp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3394 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3395 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3396 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3397 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3398 m = _PyImport_LoadDynamicModule(name, pathname, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3399 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3400 if (fp)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3401 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3402 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	3403 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3404
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3405 #endif /* HAVE_DYNAMIC_LOADING */
528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3406
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3407 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3408 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	3409 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3410 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3411 char *pathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3412 PyObject *fob = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3413 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3414 FILE *fp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3415 if (!PyArg_ParseTuple(args, "ses\|O:load_source",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3416 &name,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3417 Py_FileSystemDefaultEncoding, &pathname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3418 &fob))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3419 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3420 fp = get_file(pathname, fob, "r");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3421 if (fp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3422 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3423 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3424 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3425 m = load_source_module(name, pathname, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3426 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3427 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3428 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	3429 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3430
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3431 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3432 imp_load_module(PyObject self, PyObject args)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3433 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3434 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3435 PyObject *fob;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3436 char *pathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3437 PyObject * ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3438 char suffix; / Unused */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3439 char *mode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3440 int type;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3441 FILE *fp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3442
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3443 if (!PyArg_ParseTuple(args, "sOes(ssi):load_module",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3444 &name, &fob,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3445 Py_FileSystemDefaultEncoding, &pathname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3446 &suffix, &mode, &type))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3447 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3448 if (*mode) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3449 /* Mode must start with 'r' or 'U' and must not contain '+'.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3450 Implicit in this test is the assumption that the mode
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3451 may contain other modifiers like 'b' or 't'. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3452
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3453 if (!(mode == 'r' \|\| mode == 'U') \|\| strchr(mode, '+')) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3454 PyErr_Format(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3455 "invalid file open mode %.200s", mode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3456 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3457 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3458 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3459 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3460 if (fob == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3461 fp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3462 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3463 fp = get_file(NULL, fob, mode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3464 if (fp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3465 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3466 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3467 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3468 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3469 ret = load_module(name, fp, pathname, type, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3470 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3471 if (fp)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3472 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3473 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3474 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3475
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3476 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3477 imp_load_package(PyObject self, PyObject args)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3478 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3479 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3480 char *pathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3481 PyObject * ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3482 if (!PyArg_ParseTuple(args, "ses:load_package",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3483 &name, Py_FileSystemDefaultEncoding, &pathname))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3484 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3485 ret = load_package(name, pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3486 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3487 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3488 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3489
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3490 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3491 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	3492 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3493 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3494 if (!PyArg_ParseTuple(args, "s:new_module", &name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3495 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3496 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	3497 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3498
44567 cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3499 static PyObject *
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3500 imp_reload(PyObject self, PyObject v)
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3501 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3502 return PyImport_ReloadModule(v);
44567 cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3503 }
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3504
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3505 PyDoc_STRVAR(doc_reload,
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3506 "reload(module) -> module\n\
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3507 \n\
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3508 Reload the module. The module must have been successfully imported before.");
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3509
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3510 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3511 imp_cache_from_source(PyObject self, PyObject args, PyObject *kws)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3512 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3513 static char *kwlist[] = {"path", "debug_override", NULL};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3514
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3515 char buf[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3516 char pathname, cpathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3517 PyObject *debug_override = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3518 int debug = !Py_OptimizeFlag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3519
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3520 if (!PyArg_ParseTupleAndKeywords(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3521 args, kws, "es\|O", kwlist,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3522 Py_FileSystemDefaultEncoding, &pathname, &debug_override))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3523 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3524
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3525 if (debug_override != Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3526 if ((debug = PyObject_IsTrue(debug_override)) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3527 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3528
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3529 cpathname = make_compiled_pathname(pathname, buf, MAXPATHLEN+1, debug);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3530 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3531
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3532 if (cpathname == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3533 PyErr_Format(PyExc_SystemError, "path buffer too short");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3534 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3535 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3536 return PyUnicode_FromString(buf);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3537 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3538
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3539 PyDoc_STRVAR(doc_cache_from_source,
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3540 "Given the path to a .py file, return the path to its .pyc/.pyo file.\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3541 \n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3542 The .py file does not need to exist; this simply returns the path to the\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3543 .pyc/.pyo file calculated as if the .py file were imported. The extension\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3544 will be .pyc unless __debug__ is not defined, then it will be .pyo.\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3545 \n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3546 If debug_override is not None, then it must be a boolean and is taken as\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3547 the value of __debug__ instead.");
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3548
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3549 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3550 imp_source_from_cache(PyObject self, PyObject args, PyObject *kws)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3551 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3552 static char *kwlist[] = {"path", NULL};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3553
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3554 char *pathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3555 char buf[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3556
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3557 if (!PyArg_ParseTupleAndKeywords(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3558 args, kws, "es", kwlist,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3559 Py_FileSystemDefaultEncoding, &pathname))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3560 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3561
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3562 if (make_source_pathname(pathname, buf) == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3563 PyErr_Format(PyExc_ValueError, "Not a PEP 3147 pyc path: %s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3564 pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3565 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3566 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3567 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3568 PyMem_Free(pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3569 return PyUnicode_FromString(buf);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3570 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3571
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3572 PyDoc_STRVAR(doc_source_from_cache,
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3573 "Given the path to a .pyc./.pyo file, return the path to its .py file.\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3574 \n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3575 The .pyc/.pyo file does not need to exist; this simply returns the path to\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3576 the .py file calculated to correspond to the .pyc/.pyo file. If path\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3577 does not conform to PEP 3147 format, ValueError will be raised.");
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3578
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3579 /* Doc strings */
6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3580
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3581 PyDoc_STRVAR(doc_imp,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3582 "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	3583 __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	3584
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3585 PyDoc_STRVAR(doc_find_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3586 "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	3587 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	3588 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	3589 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	3590 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	3591
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3592 PyDoc_STRVAR(doc_load_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3593 "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	3594 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	3595 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	3596
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3597 PyDoc_STRVAR(doc_get_magic,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3598 "get_magic() -> string\n\
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3599 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	3600
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3601 PyDoc_STRVAR(doc_get_tag,
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3602 "get_tag() -> string\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3603 Return the magic tag for .pyc or .pyo files.");
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3604
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3605 PyDoc_STRVAR(doc_get_suffixes,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3606 "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	3607 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	3608 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	3609
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3610 PyDoc_STRVAR(doc_new_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3611 "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	3612 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	3613 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	3614
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3615 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	3616 "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	3617 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	3618 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	3619
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3620 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	3621 "acquire_lock() -> None\n\
27853 5620b0786271 Cleanup from patch #683257: Neal Norwitz <nnorwitz@gmail.com> parents: 27852 diff changeset	3622 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	3623 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	3624 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	3625 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	3626
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3627 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	3628 "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	3629 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	3630 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	3631
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3632 static PyMethodDef imp_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3633 {"find_module", imp_find_module, METH_VARARGS, doc_find_module},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3634 {"get_magic", imp_get_magic, METH_NOARGS, doc_get_magic},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3635 {"get_tag", imp_get_tag, METH_NOARGS, doc_get_tag},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3636 {"get_suffixes", imp_get_suffixes, METH_NOARGS, doc_get_suffixes},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3637 {"load_module", imp_load_module, METH_VARARGS, doc_load_module},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3638 {"new_module", imp_new_module, METH_VARARGS, doc_new_module},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3639 {"lock_held", imp_lock_held, METH_NOARGS, doc_lock_held},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3640 {"acquire_lock", imp_acquire_lock, METH_NOARGS, doc_acquire_lock},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3641 {"release_lock", imp_release_lock, METH_NOARGS, doc_release_lock},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3642 {"reload", imp_reload, METH_O, doc_reload},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3643 {"cache_from_source", (PyCFunction)imp_cache_from_source,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3644 METH_VARARGS \| METH_KEYWORDS, doc_cache_from_source},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3645 {"source_from_cache", (PyCFunction)imp_source_from_cache,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3646 METH_VARARGS \| METH_KEYWORDS, doc_source_from_cache},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3647 /* The rest are obsolete */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3648 {"get_frozen_object", imp_get_frozen_object, METH_VARARGS},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3649 {"is_frozen_package", imp_is_frozen_package, METH_VARARGS},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3650 {"init_builtin", imp_init_builtin, METH_VARARGS},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3651 {"init_frozen", imp_init_frozen, METH_VARARGS},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3652 {"is_builtin", imp_is_builtin, METH_VARARGS},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3653 {"is_frozen", imp_is_frozen, METH_VARARGS},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3654 {"load_compiled", imp_load_compiled, METH_VARARGS},
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3655 #ifdef HAVE_DYNAMIC_LOADING
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3656 {"load_dynamic", imp_load_dynamic, METH_VARARGS},
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3657 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3658 {"load_package", imp_load_package, METH_VARARGS},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3659 {"load_source", imp_load_source, METH_VARARGS},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3660 {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	3661 };
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3662
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8613 diff changeset	3663 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3664 setint(PyObject d, char name, int value)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3665 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3666 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3667 int err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3668
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3669 v = PyLong_FromLong((long)value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3670 err = PyDict_SetItemString(d, name, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3671 Py_XDECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3672 return err;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3673 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3674
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3675 typedef struct {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3676 PyObject_HEAD
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3677 } NullImporter;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3678
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3679 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3680 NullImporter_init(NullImporter self, PyObject args, PyObject *kwds)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3681 {
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3682 #ifndef MS_WINDOWS
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3683 PyObject *path;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3684 struct stat statbuf;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3685 int rv;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3686
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3687 if (!_PyArg_NoKeywords("NullImporter()", kwds))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3688 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3689
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3690 if (!PyArg_ParseTuple(args, "O&:NullImporter",
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3691 PyUnicode_FSConverter, &path))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3692 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3693
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3694 if (PyBytes_GET_SIZE(path) == 0) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3695 Py_DECREF(path);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3696 PyErr_SetString(PyExc_ImportError, "empty pathname");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3697 return -1;
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3698 }
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3699
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3700 rv = stat(PyBytes_AS_STRING(path), &statbuf);
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3701 Py_DECREF(path);
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3702 if (rv == 0) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3703 /* it exists */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3704 if (S_ISDIR(statbuf.st_mode)) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3705 /* it's a directory */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3706 PyErr_SetString(PyExc_ImportError, "existing directory");
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3707 return -1;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3708 }
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3709 }
50991 a823c9f3a452 Merged revisions 68457 via svnmerge from Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 50619 diff changeset	3710 #else /* MS_WINDOWS */
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3711 PyObject *pathobj;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3712 DWORD rv;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3713 wchar_t path[MAXPATHLEN+1];
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3714 Py_ssize_t len;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3715
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3716 if (!_PyArg_NoKeywords("NullImporter()", kwds))
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3717 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3718
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3719 if (!PyArg_ParseTuple(args, "U:NullImporter",
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3720 &pathobj))
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3721 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3722
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3723 if (PyUnicode_GET_SIZE(pathobj) == 0) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3724 PyErr_SetString(PyExc_ImportError, "empty pathname");
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3725 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3726 }
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3727
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3728 len = PyUnicode_AsWideChar((PyUnicodeObject*)pathobj,
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3729 path, sizeof(path) / sizeof(path[0]));
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3730 if (len == -1)
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3731 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3732 /* see issue1293 and issue3677:
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3733 * stat() on Windows doesn't recognise paths like
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3734 * "e:\\shared\\" and "\\\\whiterab-c2znlh\\shared" as dirs.
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3735 */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3736 rv = GetFileAttributesW(path);
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3737 if (rv != INVALID_FILE_ATTRIBUTES) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3738 /* it exists */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3739 if (rv & FILE_ATTRIBUTE_DIRECTORY) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3740 /* it's a directory */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3741 PyErr_SetString(PyExc_ImportError, "existing directory");
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3742 return -1;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3743 }
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3744 }
50991 a823c9f3a452 Merged revisions 68457 via svnmerge from Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 50619 diff changeset	3745 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3746 return 0;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3747 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3748
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3749 static PyObject *
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3750 NullImporter_find_module(NullImporter self, PyObject args)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3751 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3752 Py_RETURN_NONE;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3753 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3754
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3755 static PyMethodDef NullImporter_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3756 {"find_module", (PyCFunction)NullImporter_find_module, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3757 "Always return None"
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3758 },
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3759 {NULL} /* Sentinel */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3760 };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3761
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3762
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	3763 PyTypeObject PyNullImporter_Type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3764 PyVarObject_HEAD_INIT(NULL, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3765 "imp.NullImporter", /tp_name/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3766 sizeof(NullImporter), /tp_basicsize/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3767 0, /tp_itemsize/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3768 0, /tp_dealloc/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3769 0, /tp_print/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3770 0, /tp_getattr/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3771 0, /tp_setattr/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3772 0, /tp_reserved/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3773 0, /tp_repr/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3774 0, /tp_as_number/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3775 0, /tp_as_sequence/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3776 0, /tp_as_mapping/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3777 0, /tp_hash /
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3778 0, /tp_call/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3779 0, /tp_str/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3780 0, /tp_getattro/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3781 0, /tp_setattro/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3782 0, /tp_as_buffer/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3783 Py_TPFLAGS_DEFAULT, /tp_flags/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3784 "Null importer object", /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3785 0, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3786 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3787 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3788 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3789 0, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3790 0, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3791 NullImporter_methods, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3792 0, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3793 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3794 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3795 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3796 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3797 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3798 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3799 (initproc)NullImporter_init, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3800 0, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3801 PyType_GenericNew /* tp_new */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3802 };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3803
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3804 static struct PyModuleDef impmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3805 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3806 "imp",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3807 doc_imp,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3808 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3809 imp_methods,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3810 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3811 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3812 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3813 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3814 };
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3815
30311 f003e48f562d Bug #794140: cygwin builds do not embed Jason Tishler <jason@tishler.net> parents: 29812 diff changeset	3816 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3817 PyInit_imp(void)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3818 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3819 PyObject m, d;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3820
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3821 if (PyType_Ready(&PyNullImporter_Type) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3822 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3823
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3824 m = PyModule_Create(&impmodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3825 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3826 goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3827 d = PyModule_GetDict(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3828 if (d == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3829 goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3830
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3831 if (setint(d, "SEARCH_ERROR", SEARCH_ERROR) < 0) goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3832 if (setint(d, "PY_SOURCE", PY_SOURCE) < 0) goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3833 if (setint(d, "PY_COMPILED", PY_COMPILED) < 0) goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3834 if (setint(d, "C_EXTENSION", C_EXTENSION) < 0) goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3835 if (setint(d, "PY_RESOURCE", PY_RESOURCE) < 0) goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3836 if (setint(d, "PKG_DIRECTORY", PKG_DIRECTORY) < 0) goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3837 if (setint(d, "C_BUILTIN", C_BUILTIN) < 0) goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3838 if (setint(d, "PY_FROZEN", PY_FROZEN) < 0) goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3839 if (setint(d, "PY_CODERESOURCE", PY_CODERESOURCE) < 0) goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3840 if (setint(d, "IMP_HOOK", IMP_HOOK) < 0) goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3841
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3842 Py_INCREF(&PyNullImporter_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3843 PyModule_AddObject(m, "NullImporter", (PyObject *)&PyNullImporter_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3844 return m;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3845 failure:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3846 Py_XDECREF(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3847 return NULL;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3848 }
8330 7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3849
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3850
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12543 diff changeset	3851 /* 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	3852 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	3853 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	3854 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	3855
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3856 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	3857
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3858 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3859 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	3860 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3861 static struct _inittab *our_copy = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3862 struct _inittab *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3863 int i, n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3864
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3865 /* Count the number of entries in both tables */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3866 for (n = 0; newtab[n].name != NULL; n++)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3867 ;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3868 if (n == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3869 return 0; /* Nothing to do */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3870 for (i = 0; PyImport_Inittab[i].name != NULL; i++)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3871 ;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3872
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3873 /* Allocate new memory for the combined table */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3874 p = our_copy;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3875 PyMem_RESIZE(p, struct _inittab, i+n+1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3876 if (p == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3877 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3878
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3879 /* Copy the tables into the new memory */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3880 if (our_copy != PyImport_Inittab)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3881 memcpy(p, PyImport_Inittab, (i+1) * sizeof(struct _inittab));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3882 PyImport_Inittab = our_copy = p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3883 memcpy(p+i, newtab, (n+1) * sizeof(struct _inittab));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3884
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3885 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	3886 }
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3887
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3888 /* 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	3889
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3890 int
52721 54e093bd887e Merged revisions 71031 via svnmerge from Brett Cannon <bcannon@gmail.com> parents: 52547 diff changeset	3891 PyImport_AppendInittab(const char name, PyObject (*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	3892 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3893 struct _inittab newtab[2];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3894
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3895 memset(newtab, '\0', sizeof newtab);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3896
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3897 newtab[0].name = (char *)name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3898 newtab[0].initfunc = initfunc;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3899
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3900 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	3901 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	3902
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	3903 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	3904 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	3905 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/import.c @ 64620:25cc226dc9bd