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

annotate Python/import.c @ 76451:ea46ebba8a0f

Issue #13959: Re-implement imp.source_from_cache() in Lib/imp.py.

author	Brett Cannon <brett@python.org>
date	Sat, 21 Apr 2012 18:52:52 -0400
parents	b773a751c2e7
children	085cf1480cfe

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 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	8 #include "errcode.h"
263 28f0ffd9facf Support ".pyc" files: cached compilation results. Guido van Rossum <guido@python.org> parents: 228 diff changeset	9 #include "marshal.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35678 diff changeset	10 #include "code.h"
675 5aff9f8fd299 Move SEP to osdefs.h. Use MAXPATHLEN from osdefs.h. Guido van Rossum <guido@python.org> parents: 630 diff changeset	11 #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	12 #include "importdl.h"
263 28f0ffd9facf Support ".pyc" files: cached compilation results. Guido van Rossum <guido@python.org> parents: 228 diff changeset	13
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	14 #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	15 #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	16 #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	17 #ifdef __cplusplus
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	18 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	19 #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	20
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45471 diff changeset	21 #ifdef MS_WINDOWS
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45471 diff changeset	22 /* for stat.st_mode */
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45471 diff changeset	23 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	24 /* for _mkdir */
84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	25 #include <direct.h>
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45471 diff changeset	26 #endif
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45471 diff changeset	27
1351 e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	28
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	29 /* 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	30 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	31
adb42a711696 Bump the magic number to avoid sharing bytecode between 2.3 and 2.4. Jeremy Hylton <jeremy@alum.mit.edu> parents: 31824 diff changeset	32 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	33 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	34 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	35
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36926 diff changeset	36 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	37 -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	38 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	39
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	40 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	41 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	42 10.
25085 5fe4d93df429 Because MWH changed the bytecode again, moved the magic number back Guido van Rossum <guido@python.org> parents: 24844 diff changeset	43
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	44 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	45 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	46 to represent the magic number in __pycache__ directories. When you change
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	47 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	48 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	49 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	50 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	51 with Python 3.2a0.
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	52
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	53 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	54 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	55 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	56 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	57 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	58 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	59 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	60 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	61 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	62 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	63 Python 2.2: 60717
23851 d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	64 Python 2.3a0: 62011
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24071 diff changeset	65 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	66 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	67 Python 2.4a0: 62041
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 32882 diff changeset	68 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	69 Python 2.4b1: 62061
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34961 diff changeset	70 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	71 Python 2.5a0: 62081 (ast-branch)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36501 diff changeset	72 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	73 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	74 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	75 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	76 Python 2.5c1: 62121 (fix wrong lnotab with for loops and
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	77 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	78 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	79 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	80 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	81 Python 3000: 3000
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	82 3010 (removed UNARY_CONVERT)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	83 3020 (added BUILD_SET)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	84 3030 (added keyword-only parameters)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	85 3040 (added signature annotations)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	86 3050 (print becomes a function)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	87 3060 (PEP 3115 metaclass syntax)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	88 3061 (string literals become unicode)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	89 3071 (PEP 3109 raise changes)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	90 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	91 3091 (kill str8 interning)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	92 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	93 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	94 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	95 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	96 Python 3.1a0: 3141 (optimize list, set and dict comprehensions:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	97 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	98 Python 3.1a0: 3151 (optimize conditional branches:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	99 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	100 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	101 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	102 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	103 tag: cpython-32
64621 252895d49157 bump magic number for DELETE_DEREF Benjamin Peterson <benjamin@python.org> parents: 64594 diff changeset	104 Python 3.2a2 3180 (add DELETE_DEREF)
70894 9a6d9ac6fb2e bump magic for super closure change Benjamin Peterson <benjamin@python.org> parents: 70631 diff changeset	105 Python 3.3a0 3190 __class__ super closure changed
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 73592 diff changeset	106 Python 3.3a0 3200 (__qualname__ added)
75717 f7727fc043a9 fix comment Benjamin Peterson <benjamin@python.org> parents: 75714 diff changeset	107 3210 (added size modulo 2**32 to the pyc header)
f7727fc043a9 fix comment Benjamin Peterson <benjamin@python.org> parents: 75714 diff changeset	108 Python 3.3a1 3220 (changed PEP 380 implementation)
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	109 */
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52721 diff changeset	110
64638 20a2153b0dda Fix incorrect comment regarding MAGIC and TAG in import.c Nick Coghlan <ncoghlan@gmail.com> parents: 64621 diff changeset	111 /* MAGIC must change whenever the bytecode emitted by the compiler may no
20a2153b0dda Fix incorrect comment regarding MAGIC and TAG in import.c Nick Coghlan <ncoghlan@gmail.com> parents: 64621 diff changeset	112 longer be understood by older implementations of the eval loop (usually
20a2153b0dda Fix incorrect comment regarding MAGIC and TAG in import.c Nick Coghlan <ncoghlan@gmail.com> parents: 64621 diff changeset	113 due to the addition of new opcodes)
20a2153b0dda Fix incorrect comment regarding MAGIC and TAG in import.c Nick Coghlan <ncoghlan@gmail.com> parents: 64621 diff changeset	114 TAG must change for each major Python release. The magic number will take
20a2153b0dda Fix incorrect comment regarding MAGIC and TAG in import.c Nick Coghlan <ncoghlan@gmail.com> parents: 64621 diff changeset	115 care of any bytecode changes that occur during development.
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	116 */
70631 d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	117 #define QUOTE(arg) #arg
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	118 #define STRIFY(name) QUOTE(name)
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	119 #define MAJOR STRIFY(PY_MAJOR_VERSION)
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	120 #define MINOR STRIFY(PY_MINOR_VERSION)
75739 c0a6569fdad6 in 72556ff86828, I should have updated the magic as well as the comment (#14230) Benjamin Peterson <benjamin@python.org> parents: 75717 diff changeset	121 #define MAGIC (3220 \| ((long)'\r'<<16) \| ((long)'\n'<<24))
70631 d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	122 #define TAG "cpython-" MAJOR MINOR;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	123 #define CACHEDIR "__pycache__"
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	124 /* Current magic word and string tag as globals. */
12543 c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	125 static long pyc_magic = MAGIC;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	126 static const char *pyc_tag = TAG;
70631 d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	127 #undef QUOTE
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	128 #undef STRIFY
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	129 #undef MAJOR
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	130 #undef MINOR
12543 c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	131
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	132 /* See _PyImport_FixupExtensionObject() below */
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	133 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	134
69148 7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	135 /* Function from Parser/tokenizer.c */
7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	136 extern char * PyTokenizer_FindEncodingFilename(int, PyObject *);
7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	137
6541 b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	138 /* 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	139 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	140
b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	141 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	142
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	143 /* 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	144 struct filedescr * _PyImport_Filetab = NULL;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	145
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	146 static const struct filedescr _PyImport_StandardFiletab[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	147 {".py", "U", PY_SOURCE},
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23879 diff changeset	148 #ifdef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	149 {".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	150 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	151 {".pyc", "rb", PY_COMPILED},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	152 {0, 0}
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	153 };
5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	154
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	155 static PyObject *initstr = NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	156
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	157 /* Initialize things */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	158
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	159 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	160 _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	161 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	162 const struct filedescr *scan;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	163 struct filedescr *filetab;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	164 int countD = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	165 int countS = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	166
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	167 initstr = PyUnicode_InternFromString("__init__");
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	168 if (initstr == NULL)
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	169 Py_FatalError("Can't initialize import variables");
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	170
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	171 /* prepare _PyImport_Filetab: copy entries from
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	172 _PyImport_DynLoadFiletab and _PyImport_StandardFiletab.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	173 */
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	174 #ifdef HAVE_DYNAMIC_LOADING
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	175 for (scan = _PyImport_DynLoadFiletab; scan->suffix != NULL; ++scan)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	176 ++countD;
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	177 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	178 for (scan = _PyImport_StandardFiletab; scan->suffix != NULL; ++scan)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	179 ++countS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	180 filetab = PyMem_NEW(struct filedescr, countD + countS + 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	181 if (filetab == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	182 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	183 #ifdef HAVE_DYNAMIC_LOADING
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	184 memcpy(filetab, _PyImport_DynLoadFiletab,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	185 countD * sizeof(struct filedescr));
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	186 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	187 memcpy(filetab + countD, _PyImport_StandardFiletab,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	188 countS * sizeof(struct filedescr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	189 filetab[countD + countS].suffix = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	190
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	191 _PyImport_Filetab = filetab;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	192
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	193 if (Py_OptimizeFlag) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	194 /* Replace ".pyc" with ".pyo" in _PyImport_Filetab */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	195 for (; filetab->suffix != NULL; filetab++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	196 if (strcmp(filetab->suffix, ".pyc") == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	197 filetab->suffix = ".pyo";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	198 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	199 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	200 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	201
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	202 void
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	203 _PyImportHooks_Init(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	204 {
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	205 PyObject v, path_hooks = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	206 int err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	207
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	208 if (PyType_Ready(&PyNullImporter_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	209 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	210
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	211 /* adding sys.path_hooks and sys.path_importer_cache */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	212 v = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	213 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	214 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	215 err = PySys_SetObject("meta_path", v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	216 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	217 if (err)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	218 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	219 v = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	220 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	221 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	222 err = PySys_SetObject("path_importer_cache", v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	223 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	224 if (err)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	225 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	226 path_hooks = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	227 if (path_hooks == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	228 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	229 err = PySys_SetObject("path_hooks", path_hooks);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	230 if (err) {
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	231 error:
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	232 PyErr_Print();
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	233 Py_FatalError("initializing sys.meta_path, sys.path_hooks, "
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	234 "path_importer_cache, or NullImporter failed"
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	235 );
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	236 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	237 Py_DECREF(path_hooks);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	238 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	239
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	240 void
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	241 _PyImportZip_Init(void)
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	242 {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	243 PyObject path_hooks, zimpimport;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	244 int err = 0;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	245
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	246 path_hooks = PySys_GetObject("path_hooks");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	247 if (path_hooks == NULL)
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	248 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	249
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	250 if (Py_VerboseFlag)
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	251 PySys_WriteStderr("# installing zipimport hook\n");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	252
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	253 zimpimport = PyImport_ImportModule("zipimport");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	254 if (zimpimport == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	255 PyErr_Clear(); /* No zip import module -- okay */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	256 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	257 PySys_WriteStderr("# can't import zipimport\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	258 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	259 else {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72866 diff changeset	260 _Py_IDENTIFIER(zipimporter);
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	261 PyObject *zipimporter = _PyObject_GetAttrId(zimpimport,
81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	262 &PyId_zipimporter);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	263 Py_DECREF(zimpimport);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	264 if (zipimporter == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	265 PyErr_Clear(); /* No zipimporter object -- okay */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	266 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	267 PySys_WriteStderr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	268 "# can't import zipimport.zipimporter\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	269 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	270 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	271 /* sys.path_hooks.append(zipimporter) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	272 err = PyList_Append(path_hooks, zipimporter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	273 Py_DECREF(zipimporter);
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	274 if (err < 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	275 goto error;
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	276 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	277 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	278 PySys_WriteStderr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	279 "# installed zipimport hook\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	280 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	281 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	282
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	283 return;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	284
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	285 error:
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	286 PyErr_Print();
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	287 Py_FatalError("initializing zipimport or NullImporter failed");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	288 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	289
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	290 /* 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	291 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	292 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	293
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	294 #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	295
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9187 diff changeset	296 #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	297
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9431 diff changeset	298 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	299 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	300 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	301
56382 2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	302 void
2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	303 _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	304 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	305 long me = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	306 if (me == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	307 return; /* Too bad */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	308 if (import_lock == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	309 import_lock = PyThread_allocate_lock();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	310 if (import_lock == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	311 return; /* Nothing much we can do. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	312 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	313 if (import_lock_thread == me) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	314 import_lock_level++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	315 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	316 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	317 if (import_lock_thread != -1 \|\| !PyThread_acquire_lock(import_lock, 0))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	318 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	319 PyThreadState *tstate = PyEval_SaveThread();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	320 PyThread_acquire_lock(import_lock, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	321 PyEval_RestoreThread(tstate);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	322 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	323 import_lock_thread = me;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	324 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	325 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	326
56382 2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	327 int
2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	328 _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	329 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	330 long me = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	331 if (me == -1 \|\| import_lock == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	332 return 0; /* Too bad */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	333 if (import_lock_thread != me)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	334 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	335 import_lock_level--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	336 if (import_lock_level == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	337 import_lock_thread = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	338 PyThread_release_lock(import_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	339 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	340 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	341 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	342
59235 58c35495a934 Merged revisions 78527,78550 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 59213 diff changeset	343 /* 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	344 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	345 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	346 (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	347
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	348 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	349 _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	350 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	351 if (import_lock != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	352 import_lock = PyThread_allocate_lock();
66599 09ed411a1090 Issue #9573: os.fork now works when triggered as a side effect of import (the wisdom of actually relying on this remains questionable!) Nick Coghlan <ncoghlan@gmail.com> parents: 66556 diff changeset	353 if (import_lock_level > 1) {
09ed411a1090 Issue #9573: os.fork now works when triggered as a side effect of import (the wisdom of actually relying on this remains questionable!) Nick Coghlan <ncoghlan@gmail.com> parents: 66556 diff changeset	354 /* Forked as a side effect of import */
09ed411a1090 Issue #9573: os.fork now works when triggered as a side effect of import (the wisdom of actually relying on this remains questionable!) Nick Coghlan <ncoghlan@gmail.com> parents: 66556 diff changeset	355 long me = PyThread_get_thread_ident();
09ed411a1090 Issue #9573: os.fork now works when triggered as a side effect of import (the wisdom of actually relying on this remains questionable!) Nick Coghlan <ncoghlan@gmail.com> parents: 66556 diff changeset	356 PyThread_acquire_lock(import_lock, 0);
68708 a9d6c7e15456 import.c: replace tab by spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 68258 diff changeset	357 /* XXX: can the previous line fail? */
66599 09ed411a1090 Issue #9573: os.fork now works when triggered as a side effect of import (the wisdom of actually relying on this remains questionable!) Nick Coghlan <ncoghlan@gmail.com> parents: 66556 diff changeset	358 import_lock_thread = me;
09ed411a1090 Issue #9573: os.fork now works when triggered as a side effect of import (the wisdom of actually relying on this remains questionable!) Nick Coghlan <ncoghlan@gmail.com> parents: 66556 diff changeset	359 import_lock_level--;
09ed411a1090 Issue #9573: os.fork now works when triggered as a side effect of import (the wisdom of actually relying on this remains questionable!) Nick Coghlan <ncoghlan@gmail.com> parents: 66556 diff changeset	360 } else {
09ed411a1090 Issue #9573: os.fork now works when triggered as a side effect of import (the wisdom of actually relying on this remains questionable!) Nick Coghlan <ncoghlan@gmail.com> parents: 66556 diff changeset	361 import_lock_thread = -1;
09ed411a1090 Issue #9573: os.fork now works when triggered as a side effect of import (the wisdom of actually relying on this remains questionable!) Nick Coghlan <ncoghlan@gmail.com> parents: 66556 diff changeset	362 import_lock_level = 0;
09ed411a1090 Issue #9573: os.fork now works when triggered as a side effect of import (the wisdom of actually relying on this remains questionable!) Nick Coghlan <ncoghlan@gmail.com> parents: 66556 diff changeset	363 }
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	364 }
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	365
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	366 #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	367
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	368 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	369 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	370 {
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	371 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	372 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	373 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	374 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	375 #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	376 }
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	377
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	378 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	379 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	380 {
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	381 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	382 _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	383 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	384 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	385 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	386 }
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	387
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	388 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	389 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	390 {
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	391 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	392 if (_PyImport_ReleaseLock() < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	393 PyErr_SetString(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	394 "not holding the import lock");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	395 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	396 }
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	397 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	398 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	399 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	400 }
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	401
73205 608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	402 void
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	403 _PyImport_Fini(void)
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	404 {
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	405 Py_XDECREF(extensions);
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	406 extensions = NULL;
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	407 PyMem_DEL(_PyImport_Filetab);
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	408 _PyImport_Filetab = NULL;
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	409 #ifdef WITH_THREAD
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	410 if (import_lock != NULL) {
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	411 PyThread_free_lock(import_lock);
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	412 import_lock = NULL;
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	413 }
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	414 #endif
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	415 }
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	416
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	417 static void
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	418 imp_modules_reloading_clear(void)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	419 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	420 PyInterpreterState *interp = PyThreadState_Get()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	421 if (interp->modules_reloading != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	422 PyDict_Clear(interp->modules_reloading);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	423 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	424
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	425 /* Helper for sys */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	426
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	427 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	428 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	429 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	430 PyInterpreterState *interp = PyThreadState_GET()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	431 if (interp->modules == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	432 Py_FatalError("PyImport_GetModuleDict: no module dictionary!");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	433 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	434 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	435
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	436
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	437 /* 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	438 static char* sys_deletes[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	439 "path", "argv", "ps1", "ps2",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	440 "last_type", "last_value", "last_traceback",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	441 "path_hooks", "path_importer_cache", "meta_path",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	442 /* misc stuff */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	443 "flags", "float_info",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	444 NULL
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	445 };
fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	446
7403 185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	447 static char* sys_files[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	448 "stdin", "__stdin__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	449 "stdout", "__stdout__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	450 "stderr", "__stderr__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	451 NULL
7403 185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	452 };
185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	453
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	454
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	455 /* Un-initialize things, as good as we can */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	456
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	457 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	458 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	459 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	460 Py_ssize_t pos, ndone;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	461 PyObject key, value, *dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	462 PyInterpreterState *interp = PyThreadState_GET()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	463 PyObject *modules = interp->modules;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	464
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	465 if (modules == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	466 return; /* Already done */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	468 /* Delete some special variables first. These are common
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	469 places where user values hide and people complain when their
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	470 destructors fail. Since the modules containing them are
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	471 deleted last of all, they would come too late in the normal
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	472 destruction order. Sigh. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	473
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	474 value = PyDict_GetItemString(modules, "builtins");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	475 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	476 dict = PyModule_GetDict(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	477 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	478 PySys_WriteStderr("# clear builtins._\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	479 PyDict_SetItemString(dict, "_", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	480 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	481 value = PyDict_GetItemString(modules, "sys");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	482 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	483 char **p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	484 PyObject *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	485 dict = PyModule_GetDict(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	486 for (p = sys_deletes; *p != NULL; p++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	487 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	488 PySys_WriteStderr("# clear sys.%s\n", *p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	489 PyDict_SetItemString(dict, *p, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	490 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	491 for (p = sys_files; *p != NULL; p+=2) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	492 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	493 PySys_WriteStderr("# restore sys.%s\n", *p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	494 v = PyDict_GetItemString(dict, *(p+1));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	495 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	496 v = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	497 PyDict_SetItemString(dict, *p, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	498 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	499 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	500
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	501 /* First, delete __main__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	502 value = PyDict_GetItemString(modules, "__main__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	503 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	504 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	505 PySys_WriteStderr("# cleanup __main__\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	506 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	507 PyDict_SetItemString(modules, "__main__", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	508 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	509
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	510 /* The special treatment of "builtins" here is because even
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	511 when it's not referenced as a module, its dictionary is
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	512 referenced by almost every module's __builtins__. Since
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	513 deleting a module clears its dictionary (even if there are
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	514 references left to it), we need to delete the "builtins"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	515 module last. Likewise, we don't delete sys until the very
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	516 end because it is implicitly referenced (e.g. by print).
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	517
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	518 Also note that we 'delete' modules by replacing their entry
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	519 in the modules dict with None, rather than really deleting
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	520 them; this avoids a rehash of the modules dictionary and
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	521 also marks them as "non existent" so they won't be
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	522 re-imported. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	523
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	524 /* Next, repeatedly delete modules with a reference count of
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	525 one (skipping builtins and sys) and delete them */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	526 do {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	527 ndone = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	528 pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	529 while (PyDict_Next(modules, &pos, &key, &value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	530 if (value->ob_refcnt != 1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	531 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	532 if (PyUnicode_Check(key) && PyModule_Check(value)) {
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	533 if (PyUnicode_CompareWithASCIIString(key, "builtins") == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	534 continue;
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	535 if (PyUnicode_CompareWithASCIIString(key, "sys") == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	536 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	537 if (Py_VerboseFlag)
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	538 PySys_FormatStderr(
b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	539 "# cleanup[1] %U\n", key);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	540 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	541 PyDict_SetItem(modules, key, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	542 ndone++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	543 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	544 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	545 } while (ndone > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	546
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	547 /* Next, delete all modules (still skipping builtins and sys) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	548 pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	549 while (PyDict_Next(modules, &pos, &key, &value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	550 if (PyUnicode_Check(key) && PyModule_Check(value)) {
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	551 if (PyUnicode_CompareWithASCIIString(key, "builtins") == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	552 continue;
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	553 if (PyUnicode_CompareWithASCIIString(key, "sys") == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	554 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	555 if (Py_VerboseFlag)
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	556 PySys_FormatStderr("# cleanup[2] %U\n", key);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	557 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	558 PyDict_SetItem(modules, key, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	559 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	560 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	561
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	562 /* Next, delete sys and builtins (in that order) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	563 value = PyDict_GetItemString(modules, "sys");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	564 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	565 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	566 PySys_WriteStderr("# cleanup sys\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	567 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	568 PyDict_SetItemString(modules, "sys", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	569 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	570 value = PyDict_GetItemString(modules, "builtins");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	571 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	572 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	573 PySys_WriteStderr("# cleanup builtins\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	574 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	575 PyDict_SetItemString(modules, "builtins", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	576 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	577
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	578 /* Finally, clear and delete the modules directory */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	579 PyDict_Clear(modules);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	580 interp->modules = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	581 Py_DECREF(modules);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	582 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	583 }
166 28923e44254c Added forward declaration (to satisfy Standard C). Guido van Rossum <guido@python.org> parents: 145 diff changeset	584
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	585
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	586 /* 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	587
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	588 long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	589 PyImport_GetMagicNumber(void)
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	590 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	591 return pyc_magic;
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	592 }
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	593
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	594
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	595 const char *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	596 PyImport_GetMagicTag(void)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	597 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	598 return pyc_tag;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	599 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	600
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	601 /* 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	602 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	603 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	604 (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	605 modules), containing these modules. A copy of the module's
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	606 dictionary is stored by calling _PyImport_FixupExtensionObject()
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	607 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	608 copy can be retrieved from there by calling
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	609 _PyImport_FindExtensionObject().
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	610
62385 46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	611 Modules which do support multiple initialization set their m_size
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	612 field to a non-negative number (indicating the size of the
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	613 module-specific state). They are still recorded in the extensions
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	614 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	615 */
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	616
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	617 int
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	618 _PyImport_FixupExtensionObject(PyObject mod, PyObject name,
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	619 PyObject *filename)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	620 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	621 PyObject modules, dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	622 struct PyModuleDef *def;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	623 if (extensions == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	624 extensions = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	625 if (extensions == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	626 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	627 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	628 if (mod == NULL \|\| !PyModule_Check(mod)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	629 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	630 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	631 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	632 def = PyModule_GetDef(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	633 if (!def) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	634 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	635 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	636 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	637 modules = PyImport_GetModuleDict();
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	638 if (PyDict_SetItem(modules, name, mod) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	639 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	640 if (_PyState_AddModule(mod, def) < 0) {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	641 PyDict_DelItem(modules, name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	642 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	643 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	644 if (def->m_size == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	645 if (def->m_base.m_copy) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	646 /* Somebody already imported the module,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	647 likely under a different name.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	648 XXX this should really not happen. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	649 Py_DECREF(def->m_base.m_copy);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	650 def->m_base.m_copy = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	651 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	652 dict = PyModule_GetDict(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	653 if (dict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	654 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	655 def->m_base.m_copy = PyDict_Copy(dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	656 if (def->m_base.m_copy == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	657 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	658 }
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	659 PyDict_SetItem(extensions, filename, (PyObject*)def);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	660 return 0;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	661 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	662
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	663 int
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	664 _PyImport_FixupBuiltin(PyObject mod, char name)
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	665 {
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	666 int res;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	667 PyObject *nameobj;
68713 ced52fcd95f6 Issue #3080: Use PyUnicode_InternFromString() for builtins Victor Stinner <victor.stinner@haypocalc.com> parents: 68712 diff changeset	668 nameobj = PyUnicode_InternFromString(name);
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	669 if (nameobj == NULL)
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	670 return -1;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	671 res = _PyImport_FixupExtensionObject(mod, nameobj, nameobj);
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	672 Py_DECREF(nameobj);
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	673 return res;
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	674 }
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	675
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	676 PyObject *
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	677 _PyImport_FindExtensionObject(PyObject name, PyObject filename)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	678 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	679 PyObject mod, mdict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	680 PyModuleDef* def;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	681 if (extensions == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	682 return NULL;
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	683 def = (PyModuleDef*)PyDict_GetItem(extensions, filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	684 if (def == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	685 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	686 if (def->m_size == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	687 /* Module does not support repeated initialization */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	688 if (def->m_base.m_copy == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	689 return NULL;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	690 mod = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	691 if (mod == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	692 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	693 mdict = PyModule_GetDict(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	694 if (mdict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	695 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	696 if (PyDict_Update(mdict, def->m_base.m_copy))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	697 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	698 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	699 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	700 if (def->m_base.m_init == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	701 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	702 mod = def->m_base.m_init();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	703 if (mod == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	704 return NULL;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	705 PyDict_SetItem(PyImport_GetModuleDict(), name, mod);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	706 Py_DECREF(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	707 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	708 if (_PyState_AddModule(mod, def) < 0) {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	709 PyDict_DelItem(PyImport_GetModuleDict(), name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	710 Py_DECREF(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	711 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	712 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	713 if (Py_VerboseFlag)
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	714 PySys_FormatStderr("import %U # previously loaded (%R)\n",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	715 name, filename);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	716 return mod;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	717
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	718 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	719
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	720 PyObject *
68110 44cc9ef43127 Issue #3080: Mark _PyImport_FindBuiltin() argument as constant Victor Stinner <victor.stinner@haypocalc.com> parents: 68107 diff changeset	721 _PyImport_FindBuiltin(const char *name)
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	722 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	723 PyObject res, nameobj;
68713 ced52fcd95f6 Issue #3080: Use PyUnicode_InternFromString() for builtins Victor Stinner <victor.stinner@haypocalc.com> parents: 68712 diff changeset	724 nameobj = PyUnicode_InternFromString(name);
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	725 if (nameobj == NULL)
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	726 return NULL;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	727 res = _PyImport_FindExtensionObject(nameobj, nameobj);
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	728 Py_DECREF(nameobj);
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	729 return res;
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	730 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	731
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	732 /* 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	733 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	734 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	735 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	736 '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	737
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	738 PyObject *
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	739 PyImport_AddModuleObject(PyObject *name)
40 f28ac7f621c7 Added reload() functionality. Guido van Rossum <guido@python.org> parents: 6 diff changeset	740 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	741 PyObject *modules = PyImport_GetModuleDict();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	742 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	743
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	744 if ((m = PyDict_GetItem(modules, name)) != NULL &&
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	745 PyModule_Check(m))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	746 return m;
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	747 m = PyModule_NewObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	748 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	749 return NULL;
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	750 if (PyDict_SetItem(modules, name, m) != 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	751 Py_DECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	752 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	753 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	754 Py_DECREF(m); /* Yes, it still exists, in modules! */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	755
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	756 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	757 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	758
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	759 PyObject *
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	760 PyImport_AddModule(const char *name)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	761 {
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	762 PyObject nameobj, module;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	763 nameobj = PyUnicode_FromString(name);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	764 if (nameobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	765 return NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	766 module = PyImport_AddModuleObject(nameobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	767 Py_DECREF(nameobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	768 return module;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	769 }
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	770
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	771
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	772 /* 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	773 static void
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	774 remove_module(PyObject *name)
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	775 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	776 PyObject *modules = PyImport_GetModuleDict();
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	777 if (PyDict_GetItem(modules, name) == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	778 return;
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	779 if (PyDict_DelItem(modules, name) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	780 Py_FatalError("import: deleting existing key in"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	781 "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	782 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	783
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	784 static PyObject * get_sourcefile(PyObject *filename);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	785 static PyObject make_source_pathname(PyObject pathname);
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	786
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	787 /* 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	788 * 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	789 * 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	790 * 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	791 * 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	792 * example.
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	793 *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	794 * Note that PyImport_ExecCodeModuleWithPathnames() is the preferred, richer
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	795 * 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	796 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	797 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	798 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	799 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	800 return PyImport_ExecCodeModuleWithPathnames(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	801 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	802 }
74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	803
74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	804 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	805 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	806 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	807 return PyImport_ExecCodeModuleWithPathnames(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	808 name, co, pathname, (char *)NULL);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	809 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	810
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	811 PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	812 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	813 char *cpathname)
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	814 {
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	815 PyObject *m = NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	816 PyObject nameobj, pathobj = NULL, *cpathobj = NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	817
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	818 nameobj = PyUnicode_FromString(name);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	819 if (nameobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	820 return NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	821
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	822 if (pathname != NULL) {
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	823 pathobj = PyUnicode_DecodeFSDefault(pathname);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	824 if (pathobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	825 goto error;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	826 } else
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	827 pathobj = NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	828 if (cpathname != NULL) {
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	829 cpathobj = PyUnicode_DecodeFSDefault(cpathname);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	830 if (cpathobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	831 goto error;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	832 } else
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	833 cpathobj = NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	834 m = PyImport_ExecCodeModuleObject(nameobj, co, pathobj, cpathobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	835 error:
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	836 Py_DECREF(nameobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	837 Py_XDECREF(pathobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	838 Py_XDECREF(cpathobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	839 return m;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	840 }
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	841
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	842 PyObject*
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	843 PyImport_ExecCodeModuleObject(PyObject name, PyObject co, PyObject *pathname,
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	844 PyObject *cpathname)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	845 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	846 PyObject *modules = PyImport_GetModuleDict();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	847 PyObject m, d, *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	848
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	849 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	850 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	851 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	852 /* If the module is being reloaded, we get the old module back
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	853 and re-use its dict to exec the new code. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	854 d = PyModule_GetDict(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	855 if (PyDict_GetItemString(d, "__builtins__") == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	856 if (PyDict_SetItemString(d, "__builtins__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	857 PyEval_GetBuiltins()) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	858 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	859 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	860 /* Remember the filename as the __file__ attribute */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	861 if (pathname != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	862 v = get_sourcefile(pathname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	863 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	864 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	865 }
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	866 else
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	867 v = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	868 if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	869 v = ((PyCodeObject *)co)->co_filename;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	870 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	871 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	872 if (PyDict_SetItemString(d, "__file__", v) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	873 PyErr_Clear(); /* Not important enough to report */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	874 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	875
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	876 /* Remember the pyc path name as the __cached__ attribute. */
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	877 if (cpathname != NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	878 v = cpathname;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	879 else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	880 v = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	881 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	882 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	883
66664 62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 66650 diff changeset	884 v = PyEval_EvalCode(co, d, d);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	885 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	886 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	887 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	888
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	889 if ((m = PyDict_GetItem(modules, name)) == NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	890 PyErr_Format(PyExc_ImportError,
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	891 "Loaded module %R not found in sys.modules",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	892 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	893 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	894 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	895
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	896 Py_INCREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	897
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	898 return m;
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	899
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	900 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	901 remove_module(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	902 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	903 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	904
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	905
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	906 /* Like rightmost_sep, but operate on unicode objects. */
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	907 static Py_ssize_t
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	908 rightmost_sep_obj(PyObject* o, Py_ssize_t start, Py_ssize_t end)
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	909 {
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	910 Py_ssize_t found, i;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	911 Py_UCS4 c;
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	912 for (found = -1, i = start; i < end; i++) {
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	913 c = PyUnicode_READ_CHAR(o, i);
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	914 if (c == SEP
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	915 #ifdef ALTSEP
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	916 \|\| c == ALTSEP
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	917 #endif
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	918 )
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	919 {
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	920 found = i;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	921 }
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	922 }
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	923 return found;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	924 }
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	925
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	926
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	927 /* 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	928 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	929 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	930 3147 style, NULL is returned. buf must be at least as big as pathname;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	931 the resulting path will always be shorter.
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	932
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	933 (...)/__pycache__/foo.<tag>.pyc -> (...)/foo.py */
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	934
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	935 static PyObject*
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	936 make_source_pathname(PyObject *path)
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	937 {
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	938 Py_ssize_t left, right, dot0, dot1, len;
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	939 Py_ssize_t i, j;
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	940 PyObject *result;
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	941 int kind;
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	942 void *data;
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	943
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	944 len = PyUnicode_GET_LENGTH(path);
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	945 if (len > MAXPATHLEN)
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	946 return NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	947
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	948 /* 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	949 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	950 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	951 */
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	952 right = rightmost_sep_obj(path, 0, len);
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	953 if (right == -1)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	954 return NULL;
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	955 left = rightmost_sep_obj(path, 0, right);
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	956 if (left == -1)
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	957 left = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	958 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	959 left++;
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	960 if (right-left != sizeof(CACHEDIR)-1)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	961 return NULL;
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	962 for (i = 0; i < sizeof(CACHEDIR)-1; i++)
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	963 if (PyUnicode_READ_CHAR(path, left+i) != CACHEDIR[i])
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	964 return NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	965
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	966 /* 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	967 has two dots in it.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	968 */
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	969 dot0 = PyUnicode_FindChar(path, '.', right+1, len, 1);
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	970 if (dot0 < 0)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	971 return NULL;
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	972 dot1 = PyUnicode_FindChar(path, '.', dot0+1, len, 1);
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	973 if (dot1 < 0)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	974 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	975 /* Too many dots? */
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	976 if (PyUnicode_FindChar(path, '.', dot1+1, len, 1) != -1)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	977 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	978
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	979 /* 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	980 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	981 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	982 suffix.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	983 */
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	984 result = PyUnicode_New(left + (dot0-right) + 2,
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	985 PyUnicode_MAX_CHAR_VALUE(path));
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	986 if (!result)
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	987 return NULL;
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	988 kind = PyUnicode_KIND(result);
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	989 data = PyUnicode_DATA(result);
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	990 PyUnicode_CopyCharacters(result, 0, path, 0, (i = left));
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	991 PyUnicode_CopyCharacters(result, left, path, right+1,
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	992 (j = dot0-right));
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	993 PyUnicode_WRITE(kind, data, i+j, 'p');
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	994 PyUnicode_WRITE(kind, data, i+j+1, 'y');
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	995 return result;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	996 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	997
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	998
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	999 static void
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1000 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	1001 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1002 PyObject constants, tmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1003 Py_ssize_t i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1004
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1005 if (PyUnicode_Compare(co->co_filename, oldname))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1006 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1007
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1008 tmp = co->co_filename;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1009 co->co_filename = newname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1010 Py_INCREF(co->co_filename);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1011 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1012
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1013 constants = co->co_consts;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1014 n = PyTuple_GET_SIZE(constants);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1015 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1016 tmp = PyTuple_GET_ITEM(constants, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1017 if (PyCode_Check(tmp))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1018 update_code_filenames((PyCodeObject *)tmp,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1019 oldname, newname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1020 }
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1021 }
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1022
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1023 static void
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1024 update_compiled_module(PyCodeObject co, PyObject newname)
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1025 {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1026 PyObject *oldname;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1027
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1028 if (PyUnicode_Compare(co->co_filename, newname) == 0)
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1029 return;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1030
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1031 oldname = co->co_filename;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1032 Py_INCREF(oldname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1033 update_code_filenames(co, oldname, newname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1034 Py_DECREF(oldname);
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1035 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1036
68887 5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1037 static PyObject *
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1038 imp_fix_co_filename(PyObject self, PyObject args)
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1039 {
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1040 PyObject *co;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1041 PyObject *file_path;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1042
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1043 if (!PyArg_ParseTuple(args, "OO:_fix_co_filename", &co, &file_path))
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1044 return NULL;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1045
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1046 if (!PyCode_Check(co)) {
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1047 PyErr_SetString(PyExc_TypeError,
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1048 "first argument must be a code object");
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1049 return NULL;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1050 }
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1051
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1052 if (!PyUnicode_Check(file_path)) {
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1053 PyErr_SetString(PyExc_TypeError,
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1054 "second argument must be a string");
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1055 return NULL;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1056 }
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1057
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1058 update_compiled_module((PyCodeObject*)co, file_path);
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1059
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1060 Py_RETURN_NONE;
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1061 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1062
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1063
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	1064 /* 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	1065 * 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	1066 */
73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	1067 static PyObject *
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1068 get_sourcefile(PyObject *filename)
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	1069 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1070 Py_ssize_t len;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1071 Py_UCS4 *fileuni;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1072 PyObject *py;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1073 struct stat statbuf;
74058 2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1074 int err;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1075
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1076 len = PyUnicode_GET_LENGTH(filename);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1077 if (len == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1078 Py_RETURN_NONE;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1079
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1080 /* don't match .pyc or .pyo? */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1081 fileuni = PyUnicode_AsUCS4Copy(filename);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1082 if (!fileuni)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1083 return NULL;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1084 if (len < 5
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1085 \|\| fileuni[len-4] != '.'
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1086 \|\| (fileuni[len-3] != 'p' && fileuni[len-3] != 'P')
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1087 \|\| (fileuni[len-2] != 'y' && fileuni[len-2] != 'Y'))
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1088 goto unchanged;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1089
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1090 /* 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	1091 * 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	1092 * to py.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1093 */
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1094 py = make_source_pathname(filename);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1095 if (py == NULL) {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1096 PyErr_Clear();
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1097 py = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, fileuni, len - 1);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1098 }
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1099 if (py == NULL)
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1100 goto error;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1101
74058 2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1102 err = _Py_stat(py, &statbuf);
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1103 if (err == -2)
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1104 goto error;
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1105 if (err == 0 && S_ISREG(statbuf.st_mode)) {
72563 1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	1106 PyMem_Free(fileuni);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1107 return py;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1108 }
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1109 Py_DECREF(py);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1110 goto unchanged;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1111
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1112 error:
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1113 PyErr_Clear();
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1114 unchanged:
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1115 PyMem_Free(fileuni);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1116 Py_INCREF(filename);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1117 return filename;
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	1118 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1119
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1120 /* Forward */
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	1121 static struct filedescr find_module(PyObject , PyObject , PyObject ,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1122 PyObject , FILE , PyObject **);
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1123 static struct _frozen * find_frozen(PyObject *);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1124
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1125
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1126 /* Helper to test for built-in module */
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1127
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1128 static int
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1129 is_builtin(PyObject *name)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1130 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1131 int i, cmp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1132 for (i = 0; PyImport_Inittab[i].name != NULL; i++) {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1133 cmp = PyUnicode_CompareWithASCIIString(name, PyImport_Inittab[i].name);
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1134 if (cmp == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1135 if (PyImport_Inittab[i].initfunc == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1136 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1137 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1138 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1139 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1140 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1141 return 0;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1142 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1143
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1144
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1145 /* 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	1146 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	1147 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	1148 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	1149 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	1150 import mechanism. Cache the result in path_importer_cache.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1151 Returns a borrowed reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1152
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1153 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1154 get_path_importer(PyObject path_importer_cache, PyObject path_hooks,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1155 PyObject *p)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1156 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1157 PyObject *importer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1158 Py_ssize_t j, nhooks;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1159
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1160 /* These conditions are the caller's responsibility: */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1161 assert(PyList_Check(path_hooks));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1162 assert(PyDict_Check(path_importer_cache));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1163
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1164 nhooks = PyList_Size(path_hooks);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1165 if (nhooks < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1166 return NULL; /* Shouldn't happen */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1167
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1168 importer = PyDict_GetItem(path_importer_cache, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1169 if (importer != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1170 return importer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1171
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1172 /* set path_importer_cache[p] to None to avoid recursion */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1173 if (PyDict_SetItem(path_importer_cache, p, Py_None) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1174 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1175
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1176 for (j = 0; j < nhooks; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1177 PyObject *hook = PyList_GetItem(path_hooks, j);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1178 if (hook == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1179 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1180 importer = PyObject_CallFunctionObjArgs(hook, p, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1181 if (importer != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1182 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1183
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1184 if (!PyErr_ExceptionMatches(PyExc_ImportError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1185 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1186 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1187 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1188 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1189 if (importer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1190 importer = PyObject_CallFunctionObjArgs(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1191 (PyObject *)&PyNullImporter_Type, p, NULL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1192 );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1193 if (importer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1194 if (PyErr_ExceptionMatches(PyExc_ImportError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1195 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1196 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1197 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1198 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1199 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1200 if (importer != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1201 int err = PyDict_SetItem(path_importer_cache, p, importer);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1202 Py_DECREF(importer);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1203 if (err != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1204 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1205 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1206 return importer;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1207 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1208
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1209 PyAPI_FUNC(PyObject *)
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1210 PyImport_GetImporter(PyObject *path) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1211 PyObject importer=NULL, path_importer_cache=NULL, *path_hooks=NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1212
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1213 if ((path_importer_cache = PySys_GetObject("path_importer_cache"))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1214 if ((path_hooks = PySys_GetObject("path_hooks"))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1215 importer = get_path_importer(path_importer_cache,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1216 path_hooks, path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1217 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1218 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1219 Py_XINCREF(importer); /* get_path_importer returns a borrowed reference */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1220 return importer;
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1221 }
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1222
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1223 /* 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	1224 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	1225 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	1226
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1227 #ifdef MS_COREDLL
68715 bab42673674a Issue #3080: _PyWin_FindRegisteredModule() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68713 diff changeset	1228 extern FILE _PyWin_FindRegisteredModule(PyObject , struct filedescr **,
bab42673674a Issue #3080: _PyWin_FindRegisteredModule() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68713 diff changeset	1229 PyObject **p_path);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1230 #endif
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1231
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1232 /* Forward */
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1233 static int case_ok(PyObject , Py_ssize_t, PyObject );
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1234 static int find_init_module(PyObject *);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1235 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	1236
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1237 /* Get the path of a module: get its importer and call importer.find_module()
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1238 hook, or check if the module if a package (if path/__init__.py exists).
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1239
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1240 -1: error: a Python error occurred
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1241 0: ignore: an error occurred because of invalid data, but the error is not
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1242 important enough to be reported.
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1243 1: get path: module not found, but *buf contains its path
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1244 2: found: *p_fd is the file descriptor (IMP_HOOK or PKG_DIRECTORY)
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1245 and buf is the path /
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1246
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1247 static int
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	1248 find_module_path(PyObject fullname, PyObject name, PyObject *path,
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1249 PyObject path_hooks, PyObject path_importer_cache,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1250 PyObject p_path, PyObject p_loader, struct filedescr **p_fd)
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1251 {
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1252 PyObject path_unicode, filename = NULL;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1253 Py_ssize_t len, pos;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1254 struct stat statbuf;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1255 static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
74058 2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1256 int err, result, addsep;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1257
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1258 if (PyUnicode_Check(path)) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1259 Py_INCREF(path);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1260 path_unicode = path;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1261 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1262 else if (PyBytes_Check(path)) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1263 path_unicode = PyUnicode_DecodeFSDefaultAndSize(
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1264 PyBytes_AS_STRING(path), PyBytes_GET_SIZE(path));
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1265 if (path_unicode == NULL)
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1266 return -1;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1267 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1268 else
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1269 return 0;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1270
72718 c97ba8f80935 Fix find_module_path(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72584 diff changeset	1271 if (PyUnicode_READY(path_unicode))
c97ba8f80935 Fix find_module_path(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72584 diff changeset	1272 return -1;
c97ba8f80935 Fix find_module_path(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72584 diff changeset	1273
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1274 len = PyUnicode_GET_LENGTH(path_unicode);
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1275 if (PyUnicode_FindChar(path_unicode, 0, 0, len, 1) != -1) {
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1276 result = 0;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1277 goto out; /* path contains '\0' */
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1278 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1279
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1280 /* sys.path_hooks import hook */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1281 if (p_loader != NULL) {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72866 diff changeset	1282 _Py_IDENTIFIER(find_module);
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1283 PyObject *importer;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1284
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1285 importer = get_path_importer(path_importer_cache,
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1286 path_hooks, path);
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1287 if (importer == NULL) {
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1288 result = -1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1289 goto out;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1290 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1291 /* Note: importer is a borrowed reference */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1292 if (importer != Py_None) {
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1293 PyObject *loader;
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72718 diff changeset	1294 loader = _PyObject_CallMethodId(importer,
5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72718 diff changeset	1295 &PyId_find_module, "O", fullname);
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1296 if (loader == NULL) {
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1297 result = -1; /* error */
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1298 goto out;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1299 }
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1300 if (loader != Py_None) {
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1301 /* a loader was found */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1302 *p_loader = loader;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1303 *p_fd = &importhookdescr;
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1304 result = 2;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1305 goto out;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1306 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1307 Py_DECREF(loader);
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1308 result = 0;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1309 goto out;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1310 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1311 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1312 /* no hook was found, use builtin import */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1313
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1314 addsep = 0;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1315 if (len > 0 && PyUnicode_READ_CHAR(path_unicode, len-1) != SEP
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1316 #ifdef ALTSEP
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1317 && PyUnicode_READ_CHAR(path_unicode, len-1) != ALTSEP
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1318 #endif
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1319 )
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1320 addsep = 1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1321 filename = PyUnicode_New(len + PyUnicode_GET_LENGTH(name) + addsep,
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1322 Py_MAX(PyUnicode_MAX_CHAR_VALUE(path_unicode),
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1323 PyUnicode_MAX_CHAR_VALUE(name)));
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1324 if (filename == NULL) {
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1325 result = -1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1326 goto out;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1327 }
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1328 PyUnicode_CopyCharacters(filename, 0, path_unicode, 0, len);
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1329 pos = len;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1330 if (addsep)
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1331 PyUnicode_WRITE(PyUnicode_KIND(filename),
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1332 PyUnicode_DATA(filename),
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1333 pos++, SEP);
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1334 PyUnicode_CopyCharacters(filename, pos, name, 0,
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1335 PyUnicode_GET_LENGTH(name));
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1336
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1337 /* Check for package import (buf holds a directory name,
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1338 and there's an __init__ module in that directory */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1339 #ifdef HAVE_STAT
74058 2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1340 err = _Py_stat(filename, &statbuf);
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1341 if (err == -2) {
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1342 result = -1;
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1343 goto out;
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1344 }
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1345 if (err == 0 && /* it exists */
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1346 S_ISDIR(statbuf.st_mode)) /* it's a directory */
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1347 {
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1348 int match;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1349
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1350 match = case_ok(filename, 0, name);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1351 if (match < 0) {
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1352 result = -1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1353 goto out;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1354 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1355 if (match) { /* case matches */
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1356 if (find_init_module(filename)) { /* and has __init__.py */
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1357 *p_path = filename;
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1358 filename = NULL;
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1359 *p_fd = &fd_package;
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1360 result = 2;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1361 goto out;
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1362 }
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1363 else {
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1364 int err;
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1365 err = PyErr_WarnFormat(PyExc_ImportWarning, 1,
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1366 "Not importing directory %R: missing __init__.py",
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1367 filename);
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1368 if (err) {
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1369 result = -1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1370 goto out;
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1371 }
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1372 }
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1373 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1374 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1375 #endif
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1376 *p_path = filename;
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1377 filename = NULL;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1378 result = 1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1379 out:
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1380 Py_DECREF(path_unicode);
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1381 Py_XDECREF(filename);
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1382 return result;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1383 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1384
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1385 /* Find a module in search_path_list. For each path, try
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	1386 find_module_path() or try each _PyImport_Filetab suffix.
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1387
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1388 If the module is found, return a file descriptor, write the path in
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1389 p_filename, write the pointer to the file object into p_fp, and (if
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1390 p_loader is not NULL) the loader into *p_loader.
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1391
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1392 Otherwise, raise an exception and return NULL. */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1393
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1394 static struct filedescr*
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	1395 find_module_path_list(PyObject fullname, PyObject name,
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1396 PyObject search_path_list, PyObject path_hooks,
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1397 PyObject *path_importer_cache,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1398 PyObject p_path, 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	1399 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1400 Py_ssize_t i, npath;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1401 struct filedescr *fdp = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1402 char *filemode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1403 FILE *fp = NULL;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1404 PyObject prefix, filename;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1405 int match;
74058 2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1406 int err;
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1407
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1408 npath = PyList_Size(search_path_list);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1409 for (i = 0; i < npath; i++) {
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1410 PyObject *path;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1411 int ok;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1412
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1413 path = PyList_GetItem(search_path_list, i);
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1414 if (path == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1415 return NULL;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1416
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1417 prefix = NULL;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1418 ok = find_module_path(fullname, name, path,
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1419 path_hooks, path_importer_cache,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1420 &prefix, p_loader, &fdp);
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1421 if (ok < 0)
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1422 return NULL;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1423 if (ok == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1424 continue;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1425 if (ok == 2) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1426 *p_path = prefix;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1427 return fdp;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1428 }
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1429
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1430 for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
72454 8c6fea5794b2 Merge 3.2: Issue #7732: Don't open a directory as a file anymore while Victor Stinner <victor.stinner@haypocalc.com> parents: 72388 72453 diff changeset	1431 struct stat statbuf;
8c6fea5794b2 Merge 3.2: Issue #7732: Don't open a directory as a file anymore while Victor Stinner <victor.stinner@haypocalc.com> parents: 72388 72453 diff changeset	1432
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1433 filemode = fdp->mode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1434 if (filemode[0] == 'U')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1435 filemode = "r" PY_STDIOTEXTMODE;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1436
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1437 filename = PyUnicode_FromFormat("%U%s", prefix, fdp->suffix);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1438 if (filename == NULL) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1439 Py_DECREF(prefix);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1440 return NULL;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1441 }
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1442
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1443 if (Py_VerboseFlag > 1)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1444 PySys_FormatStderr("# trying %R\n", filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1445
74058 2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1446 err = _Py_stat(filename, &statbuf);
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1447 if (err == -2) {
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1448 Py_DECREF(prefix);
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1449 Py_DECREF(filename);
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1450 return NULL;
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1451 }
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1452 if (err != 0 \|\| S_ISDIR(statbuf.st_mode)) {
73884 174fbbed8747 Followup to a541bda2f5e2: Add a short comment. Charles-François Natali <neologix@free.fr> parents: 73879 diff changeset	1453 /* it doesn't exist, or it's a directory */
72454 8c6fea5794b2 Merge 3.2: Issue #7732: Don't open a directory as a file anymore while Victor Stinner <victor.stinner@haypocalc.com> parents: 72388 72453 diff changeset	1454 Py_DECREF(filename);
8c6fea5794b2 Merge 3.2: Issue #7732: Don't open a directory as a file anymore while Victor Stinner <victor.stinner@haypocalc.com> parents: 72388 72453 diff changeset	1455 continue;
8c6fea5794b2 Merge 3.2: Issue #7732: Don't open a directory as a file anymore while Victor Stinner <victor.stinner@haypocalc.com> parents: 72388 72453 diff changeset	1456 }
8c6fea5794b2 Merge 3.2: Issue #7732: Don't open a directory as a file anymore while Victor Stinner <victor.stinner@haypocalc.com> parents: 72388 72453 diff changeset	1457
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1458 fp = _Py_fopen(filename, filemode);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1459 if (fp == NULL) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1460 Py_DECREF(filename);
70900 7731d2ab4fd4 find_module_path_list() fails if _Py_fopen() failed and raised an exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70894 diff changeset	1461 if (PyErr_Occurred()) {
7731d2ab4fd4 find_module_path_list() fails if _Py_fopen() failed and raised an exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70894 diff changeset	1462 Py_DECREF(prefix);
7731d2ab4fd4 find_module_path_list() fails if _Py_fopen() failed and raised an exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70894 diff changeset	1463 return NULL;
7731d2ab4fd4 find_module_path_list() fails if _Py_fopen() failed and raised an exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70894 diff changeset	1464 }
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1465 continue;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1466 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1467 match = case_ok(filename, -(Py_ssize_t)strlen(fdp->suffix), name);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1468 if (match < 0) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1469 Py_DECREF(prefix);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1470 Py_DECREF(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1471 return NULL;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1472 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1473 if (match) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1474 Py_DECREF(prefix);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1475 *p_path = filename;
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1476 *p_fp = fp;
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1477 return fdp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1478 }
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1479 Py_DECREF(filename);
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1480
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1481 fclose(fp);
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1482 fp = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1483 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1484 Py_DECREF(prefix);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1485 }
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1486 PyErr_Format(PyExc_ImportError,
68738 c4361bab6914 Issue #3080: Use repr() to format the module name on error Victor Stinner <victor.stinner@haypocalc.com> parents: 68737 diff changeset	1487 "No module named %R", name);
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1488 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	1489 }
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	1490
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1491 /* Find a module:
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1492
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1493 - try find_module() of each sys.meta_path hook
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1494 - try find_frozen()
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1495 - try is_builtin()
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1496 - try _PyWin_FindRegisteredModule() (Windows only)
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1497 - otherwise, call find_module_path_list() with search_path_list (if not
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1498 NULL) or sys.path
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1499
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1500 fullname can be NULL, but only if p_loader is NULL.
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1501
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1502 Return:
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1503
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1504 - &fd_builtin (C_BUILTIN) if it is a builtin
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1505 - &fd_frozen (PY_FROZEN) if it is frozen
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1506 - &fd_package (PKG_DIRECTORY) and write the filename into *p_path
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1507 if it is a package
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1508 - &importhookdescr (IMP_HOOK) and write the loader into *p_loader if a
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1509 importer loader was found
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1510 - a file descriptor (PY_SOURCE, PY_COMPILED, C_EXTENSION, PY_RESOURCE or
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1511 PY_CODERESOURCE: see _PyImport_Filetab), write the filename into
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1512 p_path and the pointer to the open file into p_fp
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1513 - NULL on error
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1514
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1515 By default, p_path, p_fp and *p_loader (if set) are set to NULL.
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1516 Eg. *p_path is set to NULL for a builtin package.
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1517 */
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1518
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1519 static struct filedescr *
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	1520 find_module(PyObject fullname, PyObject name, PyObject *search_path_list,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1521 PyObject p_path, FILE p_fp, PyObject **p_loader)
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1522 {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1523 Py_ssize_t i, npath;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1524 static struct filedescr fd_frozen = {"", "", PY_FROZEN};
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1525 static struct filedescr fd_builtin = {"", "", C_BUILTIN};
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1526 PyObject path_hooks, path_importer_cache;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1527
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1528 *p_path = NULL;
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1529 *p_fp = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1530 if (p_loader != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1531 *p_loader = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1532
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1533 /* sys.meta_path import hook */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1534 if (p_loader != NULL) {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72866 diff changeset	1535 _Py_IDENTIFIER(find_module);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1536 PyObject *meta_path;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1537
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1538 meta_path = PySys_GetObject("meta_path");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1539 if (meta_path == NULL \|\| !PyList_Check(meta_path)) {
72385 4247f5e221c6 Fix the import machinery if there is an error on sys.path or sys.meta_path Victor Stinner <victor.stinner@haypocalc.com> parents: 72169 diff changeset	1540 PyErr_SetString(PyExc_RuntimeError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1541 "sys.meta_path must be a list of "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1542 "import hooks");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1543 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1544 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1545 Py_INCREF(meta_path); /* zap guard */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1546 npath = PyList_Size(meta_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1547 for (i = 0; i < npath; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1548 PyObject *loader;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1549 PyObject *hook = PyList_GetItem(meta_path, i);
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72718 diff changeset	1550 loader = _PyObject_CallMethodId(hook, &PyId_find_module,
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	1551 "OO", fullname,
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1552 search_path_list != NULL ?
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1553 search_path_list : Py_None);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1554 if (loader == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1555 Py_DECREF(meta_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1556 return NULL; /* true error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1557 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1558 if (loader != Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1559 /* a loader was found */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1560 *p_loader = loader;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1561 Py_DECREF(meta_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1562 return &importhookdescr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1563 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1564 Py_DECREF(loader);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1565 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1566 Py_DECREF(meta_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1567 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1568
68731 c1a5a7dca1ec Issue #3080: find_module() sets an empty path for builtin and frozen modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68730 diff changeset	1569 if (find_frozen(fullname) != NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1570 return &fd_frozen;
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1571
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1572 if (search_path_list == NULL) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1573 #ifdef MS_COREDLL
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1574 FILE *fp;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1575 struct filedescr *fdp;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1576 #endif
68731 c1a5a7dca1ec Issue #3080: find_module() sets an empty path for builtin and frozen modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68730 diff changeset	1577 if (is_builtin(name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1578 return &fd_builtin;
4111 90216e907345 PYTHONWIN -> MS_COREDLL Guido van Rossum <guido@python.org> parents: 3964 diff changeset	1579 #ifdef MS_COREDLL
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1580 fp = _PyWin_FindRegisteredModule(name, &fdp, p_path);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1581 if (fp != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1582 *p_fp = fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1583 return fdp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1584 }
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1585 else if (PyErr_Occurred())
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1586 return NULL;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1587 #endif
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1588 search_path_list = PySys_GetObject("path");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1589 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1590
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1591 if (search_path_list == NULL \|\| !PyList_Check(search_path_list)) {
72385 4247f5e221c6 Fix the import machinery if there is an error on sys.path or sys.meta_path Victor Stinner <victor.stinner@haypocalc.com> parents: 72169 diff changeset	1592 PyErr_SetString(PyExc_RuntimeError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1593 "sys.path must be a list of directory names");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1594 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1595 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1596
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1597 path_hooks = PySys_GetObject("path_hooks");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1598 if (path_hooks == NULL \|\| !PyList_Check(path_hooks)) {
72385 4247f5e221c6 Fix the import machinery if there is an error on sys.path or sys.meta_path Victor Stinner <victor.stinner@haypocalc.com> parents: 72169 diff changeset	1599 PyErr_SetString(PyExc_RuntimeError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1600 "sys.path_hooks must be a list of "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1601 "import hooks");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1602 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1603 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1604 path_importer_cache = PySys_GetObject("path_importer_cache");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1605 if (path_importer_cache == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1606 !PyDict_Check(path_importer_cache)) {
72385 4247f5e221c6 Fix the import machinery if there is an error on sys.path or sys.meta_path Victor Stinner <victor.stinner@haypocalc.com> parents: 72169 diff changeset	1607 PyErr_SetString(PyExc_RuntimeError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1608 "sys.path_importer_cache must be a dict");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1609 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1610 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1611
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1612 return find_module_path_list(fullname, name,
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1613 search_path_list, path_hooks,
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1614 path_importer_cache,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1615 p_path, p_fp, 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	1616 }
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	1617
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1618 /* case_bytes(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	1619 * 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	1620 * /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	1621 * ^ ^ ^ ^
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1622 * \|--------------------- buf ---------------------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1623 * \|------------------- len ------------------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1624 * \|------ name -------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1625 * \|----- namelen -----\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1626 * 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	1627 * 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	1628 *
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	1629 * 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	1630 * 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	1631 *
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1632 * case_bytes() is to return 1 if there's a case-sensitive match for
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1633 * name, else 0. case_bytes() is also to return 1 if envar PYTHONCASEOK
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1634 * 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	1635 *
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1636 * case_bytes() is used to implement case-sensitive import semantics even
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1637 * 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	1638 * 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	1639 * 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	1640 */
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1641
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1642 /* First we may need a pile of platform-specific header files; the sequence
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1643 * of #if's here should match the sequence in the body of case_bytes().
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1644 */
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1645 #if defined(MS_WINDOWS)
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1646 #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	1647
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1648 #elif defined(DJGPP)
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1649 #include <dir.h>
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1650
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1651 #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	1652 #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	1653 #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	1654
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1655 #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	1656 #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	1657 #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	1658 #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	1659 #include <os2.h>
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1660 #endif
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1661
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1662 #if defined(DJGPP) \
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1663 \|\| ((defined(__MACH__) && defined(__APPLE__) \|\| defined(__CYGWIN__)) \
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1664 && defined(HAVE_DIRENT_H)) \
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1665 \|\| defined(PYOS_OS2)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1666 # define USE_CASE_OK_BYTES
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1667 #endif
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1668
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1669
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1670 #ifdef USE_CASE_OK_BYTES
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1671 static int
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1672 case_bytes(char buf, Py_ssize_t len, Py_ssize_t namelen, const char name)
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	1673 {
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1674 /* 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	1675 * match the sequence just above.
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1676 */
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1677
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1678 /* DJGPP */
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1679 #if defined(DJGPP)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1680 struct ffblk ffblk;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1681 int done;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1682
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1683 if (Py_GETENV("PYTHONCASEOK") != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1684 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1685
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1686 done = findfirst(buf, &ffblk, FA_ARCH\|FA_RDONLY\|FA_HIDDEN\|FA_DIREC);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1687 if (done) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1688 PyErr_Format(PyExc_NameError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1689 "Can't find file for module %.100s\n(filename %.300s)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1690 name, buf);
68823 15f9eca5e956 Issue #3080: On DJGPP, case_bytes() returns -1 to signal an error if the file Victor Stinner <victor.stinner@haypocalc.com> parents: 68768 diff changeset	1691 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1692 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1693 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	1694
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1695 /* new-fangled macintosh (macosx) or Cygwin */
4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	1696 #elif (defined(__MACH__) && defined(__APPLE__) \|\| defined(__CYGWIN__)) && defined(HAVE_DIRENT_H)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1697 DIR *dirp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1698 struct dirent *dp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1699 char dirname[MAXPATHLEN + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1700 const int dirlen = len - namelen - 1; /* don't want trailing SEP */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1701
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1702 if (Py_GETENV("PYTHONCASEOK") != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1703 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1704
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1705 /* Copy the dir component into dirname; substitute "." if empty */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1706 if (dirlen <= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1707 dirname[0] = '.';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1708 dirname[1] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1709 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1710 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1711 assert(dirlen <= MAXPATHLEN);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1712 memcpy(dirname, buf, dirlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1713 dirname[dirlen] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1714 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1715 /* Open the directory and search the entries for an exact match. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1716 dirp = opendir(dirname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1717 if (dirp) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1718 char *nameWithExt = buf + len - namelen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1719 while ((dp = readdir(dirp)) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1720 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	1721 #ifdef _DIRENT_HAVE_D_NAMELEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1722 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	1723 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1724 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	1725 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1726 if (thislen >= namelen &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1727 strcmp(dp->d_name, nameWithExt) == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1728 (void)closedir(dirp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1729 return 1; /* Found */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1730 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1731 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1732 (void)closedir(dirp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1733 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1734 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	1735
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1736 /* OS/2 */
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	1737 #elif defined(PYOS_OS2)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1738 HDIR hdir = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1739 ULONG srchcnt = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1740 FILEFINDBUF3 ffbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1741 APIRET rc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1742
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1743 if (Py_GETENV("PYTHONCASEOK") != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1744 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1745
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1746 rc = DosFindFirst(buf,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1747 &hdir,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1748 FILE_READONLY \| FILE_HIDDEN \| FILE_SYSTEM \| FILE_DIRECTORY,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1749 &ffbuf, sizeof(ffbuf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1750 &srchcnt,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1751 FIL_STANDARD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1752 if (rc != NO_ERROR)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1753 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1754 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	1755
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1756 /* 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	1757 #else
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1758 # error "USE_CASE_OK_BYTES is not correctly defined"
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1759 #endif
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1760 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1761 #endif
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1762
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1763 /*
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1764 * Check if a filename case matchs the name case. We've already done a
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1765 * successful stat() or fopen() on buf, so know that there's some match,
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1766 * possibly case-insensitive.
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1767 *
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1768 * case_ok() is to return 1 if there's a case-sensitive match for name, 0 if it
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1769 * the filename doesn't match, or -1 on error. case_ok() is also to return 1
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1770 * if envar PYTHONCASEOK exists.
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1771 *
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1772 * case_ok() is used to implement case-sensitive import semantics even
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1773 * on platforms with case-insensitive filesystems. It's trivial to implement
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1774 * for case-sensitive filesystems. It's pretty much a cross-platform
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1775 * nightmare for systems with case-insensitive filesystems.
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1776 */
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1777
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1778 static int
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1779 case_ok(PyObject filename, Py_ssize_t prefix_delta, PyObject name)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1780 {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1781 #ifdef MS_WINDOWS
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1782 WIN32_FIND_DATAW data;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1783 HANDLE h;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1784 int cmp;
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1785 wchar_t wfilename, wname;
72866 4be55c2c2356 Fix typo in import.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72861 diff changeset	1786 Py_ssize_t wname_len;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1787
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1788 if (Py_GETENV("PYTHONCASEOK") != NULL)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1789 return 1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1790
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1791 wfilename = PyUnicode_AsUnicode(filename);
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1792 if (wfilename == NULL)
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1793 return -1;
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1794
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1795 h = FindFirstFileW(wfilename, &data);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1796 if (h == INVALID_HANDLE_VALUE) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1797 PyErr_Format(PyExc_NameError,
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1798 "Can't find file for module %R\n(filename %R)",
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1799 name, filename);
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1800 return -1;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1801 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1802 FindClose(h);
72861 6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	1803
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	1804 wname = PyUnicode_AsUnicodeAndSize(name, &wname_len);
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	1805 if (wname == NULL)
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	1806 return -1;
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	1807
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	1808 cmp = wcsncmp(data.cFileName, wname, wname_len);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1809 return cmp == 0;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1810 #elif defined(USE_CASE_OK_BYTES)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1811 int match;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1812 PyObject filebytes, namebytes;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1813 filebytes = PyUnicode_EncodeFSDefault(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1814 if (filebytes == NULL)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1815 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1816 namebytes = PyUnicode_EncodeFSDefault(name);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1817 if (namebytes == NULL) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1818 Py_DECREF(filebytes);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1819 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1820 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1821 match = case_bytes(
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1822 PyBytes_AS_STRING(filebytes),
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1823 PyBytes_GET_SIZE(filebytes) + prefix_delta,
68741 f8d6f6797909 Issue #3080: Fix case_ok() using case_bytes() Victor Stinner <victor.stinner@haypocalc.com> parents: 68739 diff changeset	1824 PyBytes_GET_SIZE(namebytes),
f8d6f6797909 Issue #3080: Fix case_ok() using case_bytes() Victor Stinner <victor.stinner@haypocalc.com> parents: 68739 diff changeset	1825 PyBytes_AS_STRING(namebytes));
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1826 Py_DECREF(filebytes);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1827 Py_DECREF(namebytes);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1828 return match;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1829 #else
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1830 /* assuming it's a case-sensitive filesystem, so there's nothing to do! */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1831 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	1832
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	1833 #endif
7305 067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	1834 }
067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	1835
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1836 #ifdef HAVE_STAT
63985 953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	1837
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1838 /* Helper to look for __init__.py or __init__.py[co] in potential package.
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1839 Return 1 if __init__ was found, 0 if not, or -1 on error. */
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1840 static int
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1841 find_init_module(PyObject *directory)
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1842 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1843 struct stat statbuf;
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1844 PyObject *filename;
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1845 int match;
74058 2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1846 int err;
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1847
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1848 filename = PyUnicode_FromFormat("%U%c__init__.py", directory, SEP);
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1849 if (filename == NULL)
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1850 return -1;
74058 2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1851 err = _Py_stat(filename, &statbuf);
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1852 if (err == -2)
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1853 return -1;
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1854 if (err == 0) {
68742 dc38c4d65cd9 Issue #3080: Fix call to case_ok() in find_init_module() Victor Stinner <victor.stinner@haypocalc.com> parents: 68741 diff changeset	1855 /* 3=len(".py") */
dc38c4d65cd9 Issue #3080: Fix call to case_ok() in find_init_module() Victor Stinner <victor.stinner@haypocalc.com> parents: 68741 diff changeset	1856 match = case_ok(filename, -3, initstr);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1857 if (match < 0) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1858 Py_DECREF(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1859 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1860 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1861 if (match) {
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1862 Py_DECREF(filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1863 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1864 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1865 }
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1866 Py_DECREF(filename);
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1867
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1868 filename = PyUnicode_FromFormat("%U%c__init__.py%c",
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1869 directory, SEP, Py_OptimizeFlag ? 'o' : 'c');
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1870 if (filename == NULL)
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1871 return -1;
74058 2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1872 err = _Py_stat(filename, &statbuf);
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1873 if (err == -2) {
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1874 Py_DECREF(filename);
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1875 return -1;
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1876 }
2a140b01d343 import.c now catchs _Py_stat() exceptions Victor Stinner <victor.stinner@haypocalc.com> parents: 73884 diff changeset	1877 if (err == 0) {
68742 dc38c4d65cd9 Issue #3080: Fix call to case_ok() in find_init_module() Victor Stinner <victor.stinner@haypocalc.com> parents: 68741 diff changeset	1878 /* 4=len(".pyc") */
dc38c4d65cd9 Issue #3080: Fix call to case_ok() in find_init_module() Victor Stinner <victor.stinner@haypocalc.com> parents: 68741 diff changeset	1879 match = case_ok(filename, -4, initstr);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1880 if (match < 0) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1881 Py_DECREF(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1882 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1883 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1884 if (match) {
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1885 Py_DECREF(filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1886 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1887 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1888 }
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1889 Py_DECREF(filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1890 return 0;
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1891 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	1892
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1893 #endif /* HAVE_STAT */
62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	1894
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	1895
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1896 static int init_builtin(PyObject ); / Forward */
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1897
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1898 /* 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	1899 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	1900 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	1901
bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1902 static int
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1903 init_builtin(PyObject *name)
141 bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1904 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1905 struct _inittab *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1906
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1907 if (_PyImport_FindExtensionObject(name, name) != NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1908 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1909
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1910 for (p = PyImport_Inittab; p->name != NULL; p++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1911 PyObject *mod;
74504 f0cbceef47c3 Fix the builtin module initialization code to store the init function for future reinitialization. Antoine Pitrou <solipsis@pitrou.net> parents: 73321 diff changeset	1912 PyModuleDef *def;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1913 if (PyUnicode_CompareWithASCIIString(name, p->name) == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1914 if (p->initfunc == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1915 PyErr_Format(PyExc_ImportError,
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1916 "Cannot re-init internal module %R",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1917 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1918 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1919 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1920 mod = (*p->initfunc)();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1921 if (mod == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1922 return -1;
74504 f0cbceef47c3 Fix the builtin module initialization code to store the init function for future reinitialization. Antoine Pitrou <solipsis@pitrou.net> parents: 73321 diff changeset	1923 /* Remember pointer to module init function. */
f0cbceef47c3 Fix the builtin module initialization code to store the init function for future reinitialization. Antoine Pitrou <solipsis@pitrou.net> parents: 73321 diff changeset	1924 def = PyModule_GetDef(mod);
f0cbceef47c3 Fix the builtin module initialization code to store the init function for future reinitialization. Antoine Pitrou <solipsis@pitrou.net> parents: 73321 diff changeset	1925 def->m_base.m_init = p->initfunc;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1926 if (_PyImport_FixupExtensionObject(mod, name, name) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1927 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1928 /* FixupExtension has put the module into sys.modules,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1929 so we can release our own reference. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1930 Py_DECREF(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1931 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1932 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1933 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1934 return 0;
141 bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1935 }
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1936
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1937
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1938 /* 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	1939
3683 ec39264311ff struct frozen is now struct _frozen and comes from import.h. Guido van Rossum <guido@python.org> parents: 3590 diff changeset	1940 static struct _frozen *
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1941 find_frozen(PyObject *name)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1942 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1943 struct _frozen *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1944
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1945 if (name == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1946 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1947
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1948 for (p = PyImport_FrozenModules; ; p++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1949 if (p->name == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1950 return NULL;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1951 if (PyUnicode_CompareWithASCIIString(name, p->name) == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1952 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1953 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1954 return p;
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1955 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1956
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1957 static PyObject *
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1958 get_frozen_object(PyObject *name)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1959 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1960 struct _frozen *p = find_frozen(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1961 int size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1962
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1963 if (p == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1964 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1965 "No such frozen object named %R",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1966 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1967 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1968 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1969 if (p->code == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1970 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1971 "Excluded frozen object named %R",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1972 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1973 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1974 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1975 size = p->size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1976 if (size < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1977 size = -size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1978 return PyMarshal_ReadObjectFromString((char *)p->code, size);
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1979 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	1980
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	1981 static PyObject *
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1982 is_frozen_package(PyObject *name)
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	1983 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1984 struct _frozen *p = find_frozen(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1985 int size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1986
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1987 if (p == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1988 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1989 "No such frozen object named %R",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1990 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1991 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1992 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1993
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1994 size = p->size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1995
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1996 if (size < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1997 Py_RETURN_TRUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1998 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1999 Py_RETURN_FALSE;
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2000 }
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2001
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2002
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2003 /* Initialize a frozen module.
52073 56983cfdf5d4 Fix a typo in a comment. Brett Cannon <bcannon@gmail.com> parents: 51996 diff changeset	2004 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	2005 an exception set if the initialization failed.
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2006 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	2007
6263e2fd9398 init_frozen non-static, frozenmain.c not in Makefile any more Guido van Rossum <guido@python.org> parents: 2270 diff changeset	2008 int
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2009 PyImport_ImportFrozenModuleObject(PyObject *name)
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2010 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2011 struct _frozen *p;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2012 PyObject co, m, *path;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2013 int ispackage;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2014 int size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2015
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2016 p = find_frozen(name);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2017
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2018 if (p == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2019 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2020 if (p->code == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2021 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2022 "Excluded frozen object named %R",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2023 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2024 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2025 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2026 size = p->size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2027 ispackage = (size < 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2028 if (ispackage)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2029 size = -size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2030 co = PyMarshal_ReadObjectFromString((char *)p->code, size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2031 if (co == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2032 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2033 if (!PyCode_Check(co)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2034 PyErr_Format(PyExc_TypeError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2035 "frozen object %R is not a code object",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2036 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2037 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2038 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2039 if (ispackage) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2040 /* Set __path__ to the package name */
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2041 PyObject d, l;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2042 int err;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2043 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2044 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2045 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2046 d = PyModule_GetDict(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2047 l = PyList_New(1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2048 if (l == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2049 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2050 }
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2051 Py_INCREF(name);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2052 PyList_SET_ITEM(l, 0, name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2053 err = PyDict_SetItemString(d, "__path__", l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2054 Py_DECREF(l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2055 if (err != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2056 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2057 }
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2058 path = PyUnicode_FromString("<frozen>");
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2059 if (path == NULL)
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2060 goto err_return;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2061 m = PyImport_ExecCodeModuleObject(name, co, path, NULL);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2062 Py_DECREF(path);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2063 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2064 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2065 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2066 Py_DECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2067 return 1;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2068 err_return:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2069 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2070 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	2071 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2072
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2073 int
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2074 PyImport_ImportFrozenModule(char *name)
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2075 {
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2076 PyObject *nameobj;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2077 int ret;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2078 nameobj = PyUnicode_InternFromString(name);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2079 if (nameobj == NULL)
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2080 return -1;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2081 ret = PyImport_ImportFrozenModuleObject(nameobj);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2082 Py_DECREF(nameobj);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2083 return ret;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2084 }
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2085
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2086
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2087 /* 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	2088 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	2089
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2090 PyObject *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35757 diff changeset	2091 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	2092 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2093 PyObject *pname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2094 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2095
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2096 pname = PyUnicode_FromString(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2097 if (pname == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2098 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2099 result = PyImport_Import(pname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2100 Py_DECREF(pname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2101 return result;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2102 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2103
44441 b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2104 /* Import a module without blocking
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2105 *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2106 * 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	2107 * 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	2108 * 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	2109 * ImportError instead of blocking.
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2110 *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2111 * 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	2112 */
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2113 PyObject *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2114 PyImport_ImportModuleNoBlock(const char *name)
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2115 {
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2116 PyObject nameobj, modules, *result;
72169 cd1978dbac08 Remove unused variable if Python is build without threads Victor Stinner <victor.stinner@haypocalc.com> parents: 68257 diff changeset	2117 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2118 long me;
72169 cd1978dbac08 Remove unused variable if Python is build without threads Victor Stinner <victor.stinner@haypocalc.com> parents: 68257 diff changeset	2119 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2120
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2121 /* Try to get the module from sys.modules[name] */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2122 modules = PyImport_GetModuleDict();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2123 if (modules == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2124 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2125
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2126 nameobj = PyUnicode_FromString(name);
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2127 if (nameobj == NULL)
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2128 return NULL;
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2129 result = PyDict_GetItem(modules, nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2130 if (result != NULL) {
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2131 Py_DECREF(nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2132 Py_INCREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2133 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2134 }
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2135 PyErr_Clear();
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	2136 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2137 /* check the import lock
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2138 * me might be -1 but I ignore the error here, the lock function
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2139 * takes care of the problem */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2140 me = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2141 if (import_lock_thread == -1 \|\| import_lock_thread == me) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2142 /* no thread or me is holding the lock */
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2143 result = PyImport_Import(nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2144 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2145 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2146 PyErr_Format(PyExc_ImportError,
68726 23fe237afa81 Issue #3080: Use %R to format module name in error messages Victor Stinner <victor.stinner@haypocalc.com> parents: 68725 diff changeset	2147 "Failed to import %R because the import lock"
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2148 "is held by another thread.",
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2149 nameobj);
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2150 result = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2151 }
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	2152 #else
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2153 result = PyImport_Import(nameobj);
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	2154 #endif
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2155 Py_DECREF(nameobj);
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2156 return result;
44441 b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2157 }
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2158
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2159
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2160 PyObject *
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2161 PyImport_ImportModuleLevelObject(PyObject name, PyObject given_globals,
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2162 PyObject locals, PyObject given_fromlist,
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2163 int level)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2164 {
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2165 _Py_IDENTIFIER(__import__);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2166 _Py_IDENTIFIER(__package__);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2167 _Py_IDENTIFIER(__path__);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2168 _Py_IDENTIFIER(__name__);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2169 _Py_IDENTIFIER(_find_and_load);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2170 _Py_IDENTIFIER(_handle_fromlist);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2171 _Py_static_string(single_dot, ".");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2172 PyObject *abs_name = NULL;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2173 PyObject *builtins_import = NULL;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2174 PyObject *final_mod = NULL;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2175 PyObject *mod = NULL;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2176 PyObject *package = NULL;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2177 PyObject *globals = NULL;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2178 PyObject *fromlist = NULL;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2179 PyInterpreterState *interp = PyThreadState_GET()->interp;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2180
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2181 /* Make sure to use default values so as to not have
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2182 PyObject_CallMethodObjArgs() truncate the parameter list because of a
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2183 NULL argument. */
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2184 if (given_globals == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2185 globals = PyDict_New();
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2186 if (globals == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2187 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2188 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2189 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2190 else {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2191 /* Only have to care what given_globals is if it will be used
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2192 fortsomething. */
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2193 if (level > 0 && !PyDict_Check(given_globals)) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2194 PyErr_SetString(PyExc_TypeError, "globals must be a dict");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2195 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2196 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2197 globals = given_globals;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2198 Py_INCREF(globals);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2199 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2200
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2201 if (given_fromlist == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2202 fromlist = PyList_New(0);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2203 if (fromlist == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2204 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2205 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2206 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2207 else {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2208 fromlist = given_fromlist;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2209 Py_INCREF(fromlist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2210 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2211 if (name == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2212 PyErr_SetString(PyExc_ValueError, "Empty module name");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2213 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2214 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2215
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2216 /* The below code is importlib.__import__() & _gcd_import(), ported to C
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2217 for added performance. */
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2218
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2219 if (!PyUnicode_Check(name)) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2220 PyErr_SetString(PyExc_TypeError, "module name must be a string");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2221 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2222 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2223 else if (PyUnicode_READY(name) < 0) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2224 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2225 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2226 if (level < 0) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2227 PyErr_SetString(PyExc_ValueError, "level must be >= 0");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2228 goto error;
75824 daed636a3536 Fixes Issue #14331: Use significantly less stack space when importing modules by Gregory P. Smith <greg@krypto.org> parents: 75176 diff changeset	2229 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2230 else if (level > 0) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2231 package = _PyDict_GetItemId(globals, &PyId___package__);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2232 if (package != NULL && package != Py_None) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2233 Py_INCREF(package);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2234 if (!PyUnicode_Check(package)) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2235 PyErr_SetString(PyExc_TypeError, "package must be a string");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2236 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2237 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2238 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2239 else {
76380 68f9ad6a3b13 Issue #14592: A relative import will raise a KeyError if __package__ Brett Cannon <brett@python.org> parents: 76379 diff changeset	2240 package = _PyDict_GetItemId(globals, &PyId___name__);
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2241 if (package == NULL) {
76380 68f9ad6a3b13 Issue #14592: A relative import will raise a KeyError if __package__ Brett Cannon <brett@python.org> parents: 76379 diff changeset	2242 PyErr_SetString(PyExc_KeyError, "'__name__' not in globals");
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2243 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2244 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2245 else if (!PyUnicode_Check(package)) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2246 PyErr_SetString(PyExc_TypeError, "__name__ must be a string");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2247 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2248 Py_INCREF(package);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2249
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2250 if (_PyDict_GetItemId(globals, &PyId___path__) == NULL) {
76304 6cfb6fb18e1f Undo a C99 idiom. Brett Cannon <brett@python.org> parents: 76303 diff changeset	2251 PyObject *partition = NULL;
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2252 PyObject *borrowed_dot = _PyUnicode_FromId(&single_dot);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2253 if (borrowed_dot == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2254 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2255 }
76304 6cfb6fb18e1f Undo a C99 idiom. Brett Cannon <brett@python.org> parents: 76303 diff changeset	2256 partition = PyUnicode_RPartition(package, borrowed_dot);
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2257 Py_DECREF(package);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2258 if (partition == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2259 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2260 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2261 package = PyTuple_GET_ITEM(partition, 0);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2262 Py_INCREF(package);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2263 Py_DECREF(partition);
68725 7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2264 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2265 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2266
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2267 if (PyDict_GetItem(interp->modules, package) == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2268 PyErr_Format(PyExc_SystemError,
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2269 "Parent module %R not loaded, cannot perform relative "
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2270 "import", package);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2271 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2272 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2273 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2274 else { /* level == 0 */
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2275 if (PyUnicode_GET_LENGTH(name) == 0) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2276 PyErr_SetString(PyExc_ValueError, "Empty module name");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2277 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2278 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2279 package = Py_None;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2280 Py_INCREF(package);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2281 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2282
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2283 if (level > 0) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2284 Py_ssize_t last_dot = PyUnicode_GET_LENGTH(package);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2285 PyObject *base = NULL;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2286 int level_up = 1;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2287
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2288 for (level_up = 1; level_up < level; level_up += 1) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2289 last_dot = PyUnicode_FindChar(package, '.', 0, last_dot, -1);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2290 if (last_dot == -2) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2291 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2292 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2293 else if (last_dot == -1) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2294 PyErr_SetString(PyExc_ValueError,
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2295 "attempted relative import beyond top-level "
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2296 "package");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2297 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2298 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2299 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2300 base = PyUnicode_Substring(package, 0, last_dot);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2301 if (PyUnicode_GET_LENGTH(name) > 0) {
76361 a3e9d5c239c4 Fix a refleak Antoine Pitrou <solipsis@pitrou.net> parents: 76358 diff changeset	2302 PyObject borrowed_dot, seq = NULL;
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2303
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2304 borrowed_dot = _PyUnicode_FromId(&single_dot);
76361 a3e9d5c239c4 Fix a refleak Antoine Pitrou <solipsis@pitrou.net> parents: 76358 diff changeset	2305 seq = PyTuple_Pack(2, base, name);
a3e9d5c239c4 Fix a refleak Antoine Pitrou <solipsis@pitrou.net> parents: 76358 diff changeset	2306 Py_DECREF(base);
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2307 if (borrowed_dot == NULL \|\| seq == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2308 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2309 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2310
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2311 abs_name = PyUnicode_Join(borrowed_dot, seq);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2312 Py_DECREF(seq);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2313 if (abs_name == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2314 goto error;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2315 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2316 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2317 else {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2318 abs_name = base;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2319 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2320 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2321 else {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2322 abs_name = name;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2323 Py_INCREF(abs_name);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2324 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2325
76307 c5da5a2a9262 Fix Windows build Brian Curtin <brian@python.org> parents: 76304 diff changeset	2326 #ifdef WITH_THREAD
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2327 _PyImport_AcquireLock();
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2328 #endif
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2329 /* From this point forward, goto error_with_unlock! */
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2330 if (PyDict_Check(globals)) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2331 builtins_import = _PyDict_GetItemId(globals, &PyId___import__);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2332 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2333 if (builtins_import == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2334 builtins_import = _PyDict_GetItemId(interp->builtins, &PyId___import__);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2335 if (builtins_import == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2336 Py_FatalError("__import__ missing");
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2337 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2338 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2339 Py_INCREF(builtins_import);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2340
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2341 mod = PyDict_GetItem(interp->modules, abs_name);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2342 if (mod == Py_None) {
76328 c9fb9f5e16e7 Set ImportError.name when raising the exception in the case of None Brett Cannon <brett@python.org> parents: 76312 diff changeset	2343 PyObject *msg = PyUnicode_FromFormat("import of %R halted; "
c9fb9f5e16e7 Set ImportError.name when raising the exception in the case of None Brett Cannon <brett@python.org> parents: 76312 diff changeset	2344 "None in sys.modules", abs_name);
c9fb9f5e16e7 Set ImportError.name when raising the exception in the case of None Brett Cannon <brett@python.org> parents: 76312 diff changeset	2345 if (msg != NULL) {
76379 7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76371 diff changeset	2346 PyErr_SetImportError(msg, abs_name, NULL);
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76371 diff changeset	2347 Py_DECREF(msg);
76328 c9fb9f5e16e7 Set ImportError.name when raising the exception in the case of None Brett Cannon <brett@python.org> parents: 76312 diff changeset	2348 }
76358 feeb1ca9e93c Fix reference loss on Py_None when None is encountered in sys.modules. Antoine Pitrou <solipsis@pitrou.net> parents: 76342 diff changeset	2349 mod = NULL;
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2350 goto error_with_unlock;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2351 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2352 else if (mod != NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2353 Py_INCREF(mod);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2354 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2355 else {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2356 mod = _PyObject_CallMethodObjIdArgs(interp->importlib,
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2357 &PyId__find_and_load, abs_name,
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2358 builtins_import, NULL);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2359 if (mod == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2360 goto error_with_unlock;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2361 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2362 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2363
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2364 if (PyObject_Not(fromlist)) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2365 if (level == 0 \|\| PyUnicode_GET_LENGTH(name) > 0) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2366 PyObject *front = NULL;
76307 c5da5a2a9262 Fix Windows build Brian Curtin <brian@python.org> parents: 76304 diff changeset	2367 PyObject *partition = NULL;
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2368 PyObject *borrowed_dot = _PyUnicode_FromId(&single_dot);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2369
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2370 if (borrowed_dot == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2371 goto error_with_unlock;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2372 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2373
76307 c5da5a2a9262 Fix Windows build Brian Curtin <brian@python.org> parents: 76304 diff changeset	2374 partition = PyUnicode_Partition(name, borrowed_dot);
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2375 if (partition == NULL) {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2376 goto error_with_unlock;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2377 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2378
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2379 front = PyTuple_GET_ITEM(partition, 0);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2380 Py_INCREF(front);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2381 Py_DECREF(partition);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2382
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2383 if (level == 0) {
76390 db5e3431ee4c rollback 005fd1fe31ab (see #14609 and #14582) Benjamin Peterson <benjamin@python.org> parents: 76381 diff changeset	2384 final_mod = PyDict_GetItem(interp->modules, front);
db5e3431ee4c rollback 005fd1fe31ab (see #14609 and #14582) Benjamin Peterson <benjamin@python.org> parents: 76381 diff changeset	2385 Py_DECREF(front);
db5e3431ee4c rollback 005fd1fe31ab (see #14609 and #14582) Benjamin Peterson <benjamin@python.org> parents: 76381 diff changeset	2386 if (final_mod == NULL) {
db5e3431ee4c rollback 005fd1fe31ab (see #14609 and #14582) Benjamin Peterson <benjamin@python.org> parents: 76381 diff changeset	2387 PyErr_Format(PyExc_KeyError,
db5e3431ee4c rollback 005fd1fe31ab (see #14609 and #14582) Benjamin Peterson <benjamin@python.org> parents: 76381 diff changeset	2388 "%R not in sys.modules as expected", front);
76329 005fd1fe31ab Issue #14582: Import returns the module returned by a loader instead Brett Cannon <brett@python.org> parents: 76328 diff changeset	2389 }
005fd1fe31ab Issue #14582: Import returns the module returned by a loader instead Brett Cannon <brett@python.org> parents: 76328 diff changeset	2390 else {
76390 db5e3431ee4c rollback 005fd1fe31ab (see #14609 and #14582) Benjamin Peterson <benjamin@python.org> parents: 76381 diff changeset	2391 Py_INCREF(final_mod);
76329 005fd1fe31ab Issue #14582: Import returns the module returned by a loader instead Brett Cannon <brett@python.org> parents: 76328 diff changeset	2392 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2393 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2394 else {
76362 9d8839289e18 Fix another refleak Antoine Pitrou <solipsis@pitrou.net> parents: 76361 diff changeset	2395 Py_ssize_t cut_off = PyUnicode_GET_LENGTH(name) -
9d8839289e18 Fix another refleak Antoine Pitrou <solipsis@pitrou.net> parents: 76361 diff changeset	2396 PyUnicode_GET_LENGTH(front);
9d8839289e18 Fix another refleak Antoine Pitrou <solipsis@pitrou.net> parents: 76361 diff changeset	2397 Py_ssize_t abs_name_len = PyUnicode_GET_LENGTH(abs_name);
76312 9e8cbf07068a Handle importing pkg.mod by executing Brett Cannon <brett@python.org> parents: 76307 diff changeset	2398 PyObject *to_return = PyUnicode_Substring(abs_name, 0,
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2399 abs_name_len - cut_off);
76362 9d8839289e18 Fix another refleak Antoine Pitrou <solipsis@pitrou.net> parents: 76361 diff changeset	2400 Py_DECREF(front);
9d8839289e18 Fix another refleak Antoine Pitrou <solipsis@pitrou.net> parents: 76361 diff changeset	2401 if (to_return == NULL) {
9d8839289e18 Fix another refleak Antoine Pitrou <solipsis@pitrou.net> parents: 76361 diff changeset	2402 goto error_with_unlock;
9d8839289e18 Fix another refleak Antoine Pitrou <solipsis@pitrou.net> parents: 76361 diff changeset	2403 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2404
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2405 final_mod = PyDict_GetItem(interp->modules, to_return);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2406 Py_DECREF(to_return);
76312 9e8cbf07068a Handle importing pkg.mod by executing Brett Cannon <brett@python.org> parents: 76307 diff changeset	2407 if (final_mod == NULL) {
9e8cbf07068a Handle importing pkg.mod by executing Brett Cannon <brett@python.org> parents: 76307 diff changeset	2408 PyErr_Format(PyExc_KeyError,
9e8cbf07068a Handle importing pkg.mod by executing Brett Cannon <brett@python.org> parents: 76307 diff changeset	2409 "%R not in sys.modules as expected",
9e8cbf07068a Handle importing pkg.mod by executing Brett Cannon <brett@python.org> parents: 76307 diff changeset	2410 to_return);
9e8cbf07068a Handle importing pkg.mod by executing Brett Cannon <brett@python.org> parents: 76307 diff changeset	2411 }
9e8cbf07068a Handle importing pkg.mod by executing Brett Cannon <brett@python.org> parents: 76307 diff changeset	2412 else {
9e8cbf07068a Handle importing pkg.mod by executing Brett Cannon <brett@python.org> parents: 76307 diff changeset	2413 Py_INCREF(final_mod);
9e8cbf07068a Handle importing pkg.mod by executing Brett Cannon <brett@python.org> parents: 76307 diff changeset	2414 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2415 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2416 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2417 else {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2418 final_mod = mod;
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2419 Py_INCREF(mod);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2420 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2421 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2422 else {
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2423 final_mod = _PyObject_CallMethodObjIdArgs(interp->importlib,
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2424 &PyId__handle_fromlist, mod,
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2425 fromlist, builtins_import,
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2426 NULL);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2427 }
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2428 error_with_unlock:
76307 c5da5a2a9262 Fix Windows build Brian Curtin <brian@python.org> parents: 76304 diff changeset	2429 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2430 if (_PyImport_ReleaseLock() < 0) {
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2431 PyErr_SetString(PyExc_RuntimeError, "not holding the import lock");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2432 }
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2433 #endif
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2434 error:
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2435 Py_XDECREF(abs_name);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2436 Py_XDECREF(builtins_import);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2437 Py_XDECREF(mod);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2438 Py_XDECREF(package);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2439 Py_XDECREF(globals);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2440 Py_XDECREF(fromlist);
2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 75826 diff changeset	2441 return final_mod;
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	2442 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	2443
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2444 PyObject *
70374 a9126e8770e5 make PyImport_ImportModuleLevel's first arg const like similiar functions (closes #12173) Benjamin Peterson <benjamin@python.org> parents: 69463 diff changeset	2445 PyImport_ImportModuleLevel(const char name, PyObject globals, PyObject *locals,
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2446 PyObject *fromlist, int level)
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2447 {
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2448 PyObject nameobj, mod;
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2449 nameobj = PyUnicode_FromString(name);
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2450 if (nameobj == NULL)
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2451 return NULL;
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2452 mod = PyImport_ImportModuleLevelObject(nameobj, globals, locals,
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2453 fromlist, level);
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2454 Py_DECREF(nameobj);
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2455 return mod;
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2456 }
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2457
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2458
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2459 /* 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	2460 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	2461
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2462 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2463 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	2464 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2465 PyInterpreterState *interp = PyThreadState_Get()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2466 PyObject *modules_reloading = interp->modules_reloading;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2467 PyObject *modules = PyImport_GetModuleDict();
76333 4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2468 PyObject loader = NULL, existing_m = NULL;
4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2469 PyObject *name;
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2470 Py_ssize_t subname_start;
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2471 PyObject *newm = NULL;
76333 4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2472 _Py_IDENTIFIER(__loader__);
4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2473 _Py_IDENTIFIER(load_module);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2474
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2475 if (modules_reloading == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2476 Py_FatalError("PyImport_ReloadModule: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2477 "no modules_reloading dictionary!");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2478 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2479 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2480
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2481 if (m == NULL \|\| !PyModule_Check(m)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2482 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2483 "reload() argument must be module");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2484 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2485 }
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2486 name = PyModule_GetNameObject(m);
a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2487 if (name == NULL \|\| PyUnicode_READY(name) == -1)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2488 return NULL;
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2489 if (m != PyDict_GetItem(modules, name)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2490 PyErr_Format(PyExc_ImportError,
68738 c4361bab6914 Issue #3080: Use repr() to format the module name on error Victor Stinner <victor.stinner@haypocalc.com> parents: 68737 diff changeset	2491 "reload(): module %R not in sys.modules",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2492 name);
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2493 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2494 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2495 }
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2496 existing_m = PyDict_GetItem(modules_reloading, name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2497 if (existing_m != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2498 /* Due to a recursive reload, this module is already
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2499 being reloaded. */
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2500 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2501 Py_INCREF(existing_m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2502 return existing_m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2503 }
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2504 if (PyDict_SetItem(modules_reloading, name, m) < 0) {
a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2505 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2506 return NULL;
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2507 }
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2508
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2509 subname_start = PyUnicode_FindChar(name, '.', 0,
a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2510 PyUnicode_GET_LENGTH(name), -1);
76333 4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2511 if (subname_start != -1) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2512 PyObject parentname, parent;
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2513 parentname = PyUnicode_Substring(name, 0, subname_start);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2514 if (parentname == NULL) {
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2515 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2516 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2517 parent = PyDict_GetItem(modules, parentname);
76333 4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2518 Py_XDECREF(parent);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2519 if (parent == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2520 PyErr_Format(PyExc_ImportError,
68738 c4361bab6914 Issue #3080: Use repr() to format the module name on error Victor Stinner <victor.stinner@haypocalc.com> parents: 68737 diff changeset	2521 "reload(): parent %R not in sys.modules",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2522 parentname);
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2523 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2524 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2525 }
76333 4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2526
4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2527 loader = _PyObject_GetAttrId(m, &PyId___loader__);
4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2528 if (loader == NULL) {
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2529 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2530 }
76333 4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2531 newm = _PyObject_CallMethodId(loader, &PyId_load_module, "O", name);
4dce3afc392c Issue #13959: Simplify imp.reload() by relying on a module's Brett Cannon <brett@python.org> parents: 76331 diff changeset	2532 Py_DECREF(loader);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2533 if (newm == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2534 /* load_module probably removed name from modules because of
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2535 * the error. Put back the original module object. We're
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2536 * going to return NULL in this case regardless of whether
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2537 * replacing name succeeds, so the return value is ignored.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2538 */
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2539 PyDict_SetItem(modules, name, m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2540 }
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2541
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2542 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2543 imp_modules_reloading_clear();
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	2544 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2545 return newm;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2546 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2547
d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2548
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2549 /* 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	2550 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	2551 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	2552 done using whatever import hooks are installed in the current
64838 dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2553 environment.
9680 8b61e1273b4b Improve comment for PyImport_Import() as suggested by Bill Tutt. Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2554 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	2555 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	2556 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	2557
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2558 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2559 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	2560 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2561 static PyObject *silly_list = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2562 static PyObject *builtins_str = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2563 static PyObject *import_str = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2564 PyObject *globals = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2565 PyObject *import = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2566 PyObject *builtins = NULL;
64838 dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2567 PyObject *modules = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2568 PyObject *r = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2569
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2570 /* Initialize constant string objects */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2571 if (silly_list == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2572 import_str = PyUnicode_InternFromString("__import__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2573 if (import_str == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2574 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2575 builtins_str = PyUnicode_InternFromString("__builtins__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2576 if (builtins_str == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2577 return NULL;
64838 dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2578 silly_list = PyList_New(0);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2579 if (silly_list == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2580 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2581 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2582
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2583 /* Get the builtins from current globals */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2584 globals = PyEval_GetGlobals();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2585 if (globals != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2586 Py_INCREF(globals);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2587 builtins = PyObject_GetItem(globals, builtins_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2588 if (builtins == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2589 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2590 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2591 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2592 /* No globals -- use standard builtins, and fake globals */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2593 builtins = PyImport_ImportModuleLevel("builtins",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2594 NULL, NULL, NULL, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2595 if (builtins == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2596 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2597 globals = Py_BuildValue("{OO}", builtins_str, builtins);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2598 if (globals == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2599 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2600 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2601
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2602 /* Get the __import__ function from the builtins */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2603 if (PyDict_Check(builtins)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2604 import = PyObject_GetItem(builtins, import_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2605 if (import == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2606 PyErr_SetObject(PyExc_KeyError, import_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2607 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2608 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2609 import = PyObject_GetAttr(builtins, import_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2610 if (import == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2611 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2612
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2613 /* Call the __import__ function with the proper argument list
64838 dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2614 Always use absolute import here.
dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2615 Calling for side-effect of import. */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2616 r = PyObject_CallFunction(import, "OOOOi", module_name, globals,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2617 globals, silly_list, 0, NULL);
64838 dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2618 if (r == NULL)
dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2619 goto err;
dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2620 Py_DECREF(r);
dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2621
dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2622 modules = PyImport_GetModuleDict();
dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2623 r = PyDict_GetItem(modules, module_name);
dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2624 if (r != NULL)
dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	2625 Py_INCREF(r);
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2626
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2627 err:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2628 Py_XDECREF(globals);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2629 Py_XDECREF(builtins);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2630 Py_XDECREF(import);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2631
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2632 return r;
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2633 }
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2634
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	2635
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2636 /* 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	2637 importing modules.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2638 */
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2639
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2640 static PyObject *
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2641 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	2642 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2643 char buf[4];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2644
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2645 buf[0] = (char) ((magic >> 0) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2646 buf[1] = (char) ((magic >> 8) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2647 buf[2] = (char) ((magic >> 16) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2648 buf[3] = (char) ((magic >> 24) & 0xff);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2649
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2650 return PyBytes_FromStringAndSize(buf, 4);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2651 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2652
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2653 static PyObject *
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2654 imp_get_magic(PyObject self, PyObject noargs)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2655 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2656 return imp_make_magic(pyc_magic);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2657 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2658
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2659 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2660 imp_get_tag(PyObject self, PyObject noargs)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2661 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2662 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	2663 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2664
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2665 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	2666 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	2667 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2668 PyObject *list;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2669 struct filedescr *fdp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2670
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2671 list = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2672 if (list == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2673 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2674 for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2675 PyObject *item = Py_BuildValue("ssi",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2676 fdp->suffix, fdp->mode, fdp->type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2677 if (item == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2678 Py_DECREF(list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2679 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2680 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2681 if (PyList_Append(list, item) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2682 Py_DECREF(list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2683 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2684 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2685 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2686 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2687 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2688 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	2689 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2690
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2691 static PyObject *
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	2692 call_find_module(PyObject name, PyObject path_list)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2693 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2694 extern int fclose(FILE *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2695 PyObject fob, ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2696 PyObject *pathobj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2697 struct filedescr *fdp;
68717 d52f471fbbeb Issue #3080: find_module() initialize buf and p_fp Victor Stinner <victor.stinner@haypocalc.com>* parents: 68716 diff changeset	2698 FILE *fp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2699 int fd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2700 char *found_encoding = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2701 char *encoding = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2702
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	2703 if (path_list == Py_None)
fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	2704 path_list = NULL;
fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	2705 fdp = find_module(NULL, name, path_list,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2706 &pathobj, &fp, NULL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2707 if (fdp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2708 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2709 if (fp != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2710 fd = fileno(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2711 if (fd != -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2712 fd = dup(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2713 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2714 fp = NULL;
75175 963a0fba98e0 In find_module(), do not silence fileno() and dup() errors. Antoine Pitrou <solipsis@pitrou.net> parents: 74611 diff changeset	2715 if (fd == -1)
963a0fba98e0 In find_module(), do not silence fileno() and dup() errors. Antoine Pitrou <solipsis@pitrou.net> parents: 74611 diff changeset	2716 return PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2717 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2718 if (fd != -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2719 if (strchr(fdp->mode, 'b') == NULL) {
69148 7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	2720 /* PyTokenizer_FindEncodingFilename() returns PyMem_MALLOC'ed
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2721 memory. */
69148 7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	2722 found_encoding = PyTokenizer_FindEncodingFilename(fd, pathobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2723 lseek(fd, 0, 0); /* Reset position */
75176 cbfd2bf80db0 Issue #14084: Fix a file descriptor leak when importing a module with a bad encoding. Antoine Pitrou <solipsis@pitrou.net> parents: 75175 diff changeset	2724 if (found_encoding == NULL && PyErr_Occurred()) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2725 Py_XDECREF(pathobj);
75176 cbfd2bf80db0 Issue #14084: Fix a file descriptor leak when importing a module with a bad encoding. Antoine Pitrou <solipsis@pitrou.net> parents: 75175 diff changeset	2726 close(fd);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2727 return NULL;
75176 cbfd2bf80db0 Issue #14084: Fix a file descriptor leak when importing a module with a bad encoding. Antoine Pitrou <solipsis@pitrou.net> parents: 75175 diff changeset	2728 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2729 encoding = (found_encoding != NULL) ? found_encoding :
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2730 (char*)PyUnicode_GetDefaultEncoding();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2731 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2732 fob = PyFile_FromFd(fd, NULL, fdp->mode, -1,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2733 (char*)encoding, NULL, NULL, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2734 if (fob == NULL) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2735 Py_XDECREF(pathobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2736 close(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2737 PyMem_FREE(found_encoding);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2738 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2739 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2740 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2741 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2742 fob = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2743 Py_INCREF(fob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2744 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2745 if (pathobj == NULL) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2746 Py_INCREF(Py_None);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2747 pathobj = Py_None;
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2748 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2749 ret = Py_BuildValue("NN(ssi)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2750 fob, pathobj, fdp->suffix, fdp->mode, fdp->type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2751 PyMem_FREE(found_encoding);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2752
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2753 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2754 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2755
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2756 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2757 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	2758 {
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2759 PyObject name, path_list = NULL;
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2760 if (!PyArg_ParseTuple(args, "U\|O:find_module",
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2761 &name, &path_list))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2762 return NULL;
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2763 return call_find_module(name, path_list);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2764 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2765
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2766 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2767 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	2768 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2769 PyObject *name;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2770 int ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2771 PyObject *m;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2772 if (!PyArg_ParseTuple(args, "U:init_builtin", &name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2773 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2774 ret = init_builtin(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2775 if (ret < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2776 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2777 if (ret == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2778 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2779 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2780 }
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2781 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2782 Py_XINCREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2783 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	2784 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2785
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2786 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2787 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	2788 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2789 PyObject *name;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2790 int ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2791 PyObject *m;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2792 if (!PyArg_ParseTuple(args, "U:init_frozen", &name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2793 return NULL;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2794 ret = PyImport_ImportFrozenModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2795 if (ret < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2796 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2797 if (ret == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2798 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2799 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2800 }
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2801 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2802 Py_XINCREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2803 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	2804 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2805
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2806 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2807 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	2808 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2809 PyObject *name;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2810
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2811 if (!PyArg_ParseTuple(args, "U:get_frozen_object", &name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2812 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2813 return get_frozen_object(name);
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2814 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2815
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2816 static PyObject *
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2817 imp_is_frozen_package(PyObject self, PyObject args)
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2818 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2819 PyObject *name;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2820
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2821 if (!PyArg_ParseTuple(args, "U:is_frozen_package", &name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2822 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2823 return is_frozen_package(name);
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2824 }
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2825
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2826 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2827 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	2828 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2829 PyObject *name;
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2830 if (!PyArg_ParseTuple(args, "U:is_builtin", &name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2831 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2832 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	2833 }
d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2834
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2835 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2836 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	2837 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2838 PyObject *name;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2839 struct _frozen *p;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2840 if (!PyArg_ParseTuple(args, "U:is_frozen", &name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2841 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2842 p = find_frozen(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2843 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	2844 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2845
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2846 static FILE *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	2847 get_file(PyObject 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	2848 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2849 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2850 if (mode[0] == 'U')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2851 mode = "r" PY_STDIOTEXTMODE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2852 if (fob == NULL) {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	2853 fp = _Py_fopen(pathname, mode);
74060 f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2854 if (!fp) {
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2855 if (!PyErr_Occurred())
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2856 PyErr_SetFromErrno(PyExc_IOError);
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2857 return NULL;
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2858 }
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2859 return fp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2860 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2861 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2862 int fd = PyObject_AsFileDescriptor(fob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2863 if (fd == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2864 return NULL;
74060 f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2865 if (!_PyVerify_fd(fd)) {
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2866 PyErr_SetFromErrno(PyExc_IOError);
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2867 return NULL;
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2868 }
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2869
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2870 /* the FILE struct gets a new fd, so that it can be closed
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2871 * independently of the file descriptor given
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2872 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2873 fd = dup(fd);
74060 f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2874 if (fd == -1) {
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2875 PyErr_SetFromErrno(PyExc_IOError);
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2876 return NULL;
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2877 }
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2878
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2879 fp = fdopen(fd, mode);
74060 f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2880 if (!fp) {
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2881 PyErr_SetFromErrno(PyExc_IOError);
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2882 return NULL;
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2883 }
f44ab94cd28b (Merge 3.2) Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 74058 diff changeset	2884 return fp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2885 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2886 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2887
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2888 #ifdef HAVE_DYNAMIC_LOADING
528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2889
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2890 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2891 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	2892 {
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2893 PyObject name, pathname, fob = NULL, mod;
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2894 FILE *fp;
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2895
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2896 if (!PyArg_ParseTuple(args, "UO&\|O:load_dynamic",
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2897 &name, PyUnicode_FSDecoder, &pathname, &fob))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2898 return NULL;
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2899 if (fob != NULL) {
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2900 fp = get_file(NULL, fob, "r");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2901 if (fp == NULL) {
68826 3114f26d5d54 Issue #11630, issue #3080: Fix refleak introduced by ef2b6305d395 Victor Stinner <victor.stinner@haypocalc.com> parents: 68823 diff changeset	2902 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2903 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2904 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2905 }
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2906 else
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2907 fp = NULL;
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2908 mod = _PyImport_LoadDynamicModule(name, pathname, fp);
68826 3114f26d5d54 Issue #11630, issue #3080: Fix refleak introduced by ef2b6305d395 Victor Stinner <victor.stinner@haypocalc.com> parents: 68823 diff changeset	2909 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2910 if (fp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2911 fclose(fp);
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	2912 return mod;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2913 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2914
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2915 #endif /* HAVE_DYNAMIC_LOADING */
528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2916
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2917 static PyObject *
44567 cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	2918 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	2919 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2920 return PyImport_ReloadModule(v);
44567 cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	2921 }
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	2922
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	2923 PyDoc_STRVAR(doc_reload,
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	2924 "reload(module) -> module\n\
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	2925 \n\
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	2926 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	2927
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2928
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	2929 /* Doc strings */
6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	2930
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	2931 PyDoc_STRVAR(doc_imp,
76331 d777f854a66e Issue #13959: Rename imp to _imp and add Lib/imp.py and begin Brett Cannon <brett@python.org> parents: 76329 diff changeset	2932 "(Extremely) low-level import machinery bits as used by importlib and imp.");
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	2933
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	2934 PyDoc_STRVAR(doc_find_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	2935 "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	2936 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	2937 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	2938 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	2939 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	2940
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	2941 PyDoc_STRVAR(doc_get_magic,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	2942 "get_magic() -> string\n\
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	2943 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	2944
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2945 PyDoc_STRVAR(doc_get_tag,
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2946 "get_tag() -> string\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2947 Return the magic tag for .pyc or .pyo files.");
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	2948
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	2949 PyDoc_STRVAR(doc_get_suffixes,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	2950 "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	2951 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	2952 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	2953
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	2954 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	2955 "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	2956 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	2957 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	2958
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	2959 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	2960 "acquire_lock() -> None\n\
27853 5620b0786271 Cleanup from patch #683257: Neal Norwitz <nnorwitz@gmail.com> parents: 27852 diff changeset	2961 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	2962 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	2963 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	2964 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	2965
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	2966 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	2967 "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	2968 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	2969 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	2970
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2971 static PyMethodDef imp_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2972 {"find_module", imp_find_module, METH_VARARGS, doc_find_module},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2973 {"get_magic", imp_get_magic, METH_NOARGS, doc_get_magic},
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	2974 {"get_tag", imp_get_tag, METH_NOARGS, doc_get_tag},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2975 {"get_suffixes", imp_get_suffixes, METH_NOARGS, doc_get_suffixes},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2976 {"lock_held", imp_lock_held, METH_NOARGS, doc_lock_held},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2977 {"acquire_lock", imp_acquire_lock, METH_NOARGS, doc_acquire_lock},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2978 {"release_lock", imp_release_lock, METH_NOARGS, doc_release_lock},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2979 {"reload", imp_reload, METH_O, doc_reload},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2980 {"get_frozen_object", imp_get_frozen_object, METH_VARARGS},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2981 {"is_frozen_package", imp_is_frozen_package, METH_VARARGS},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2982 {"init_builtin", imp_init_builtin, METH_VARARGS},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2983 {"init_frozen", imp_init_frozen, METH_VARARGS},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2984 {"is_builtin", imp_is_builtin, METH_VARARGS},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2985 {"is_frozen", imp_is_frozen, METH_VARARGS},
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2986 #ifdef HAVE_DYNAMIC_LOADING
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2987 {"load_dynamic", imp_load_dynamic, METH_VARARGS},
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2988 #endif
68887 5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	2989 {"_fix_co_filename", imp_fix_co_filename, METH_VARARGS},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2990 {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	2991 };
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2992
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8613 diff changeset	2993 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	2994 setint(PyObject d, char name, int value)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2995 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2996 PyObject *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2997 int err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2998
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2999 v = PyLong_FromLong((long)value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3000 err = PyDict_SetItemString(d, name, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3001 Py_XDECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3002 return err;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3003 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3004
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3005 typedef struct {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3006 PyObject_HEAD
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3007 } NullImporter;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3008
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3009 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3010 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	3011 {
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3012 #ifndef MS_WINDOWS
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3013 PyObject *path;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3014 struct stat statbuf;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3015 int rv;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3016
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3017 if (!_PyArg_NoKeywords("NullImporter()", kwds))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3018 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3019
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3020 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	3021 PyUnicode_FSConverter, &path))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3022 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3023
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3024 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	3025 Py_DECREF(path);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3026 PyErr_SetString(PyExc_ImportError, "empty pathname");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3027 return -1;
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3028 }
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3029
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3030 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	3031 Py_DECREF(path);
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3032 if (rv == 0) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3033 /* it exists */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3034 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	3035 /* it's a directory */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3036 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	3037 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3038 }
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3039 }
50991 a823c9f3a452 Merged revisions 68457 via svnmerge from Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 50619 diff changeset	3040 #else /* MS_WINDOWS */
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3041 PyObject *pathobj;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3042 DWORD rv;
65008 c620fe87c703 Issue #9979: Use PyUnicode_AsWideCharString() in import.c Victor Stinner <victor.stinner@haypocalc.com> parents: 64838 diff changeset	3043 wchar_t *path;
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3044
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3045 if (!_PyArg_NoKeywords("NullImporter()", kwds))
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3046 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3047
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3048 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	3049 &pathobj))
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3050 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3051
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3052 if (PyUnicode_GET_LENGTH(pathobj) == 0) {
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3053 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	3054 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3055 }
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3056
65157 e3ae5b00ba15 PyUnicode_AsWideCharString() takes a PyObject, not a PyUnicodeObject Victor Stinner <victor.stinner@haypocalc.com> parents: 65027 diff changeset	3057 path = PyUnicode_AsWideCharString(pathobj, NULL);
65008 c620fe87c703 Issue #9979: Use PyUnicode_AsWideCharString() in import.c Victor Stinner <victor.stinner@haypocalc.com> parents: 64838 diff changeset	3058 if (path == NULL)
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3059 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3060 /* see issue1293 and issue3677:
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3061 * 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	3062 * "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	3063 */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3064 rv = GetFileAttributesW(path);
65008 c620fe87c703 Issue #9979: Use PyUnicode_AsWideCharString() in import.c Victor Stinner <victor.stinner@haypocalc.com> parents: 64838 diff changeset	3065 PyMem_Free(path);
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3066 if (rv != INVALID_FILE_ATTRIBUTES) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3067 /* it exists */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3068 if (rv & FILE_ATTRIBUTE_DIRECTORY) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3069 /* it's a directory */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3070 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	3071 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3072 }
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	3073 }
50991 a823c9f3a452 Merged revisions 68457 via svnmerge from Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 50619 diff changeset	3074 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3075 return 0;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3076 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3077
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3078 static PyObject *
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3079 NullImporter_find_module(NullImporter self, PyObject args)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3080 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3081 Py_RETURN_NONE;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3082 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3083
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3084 static PyMethodDef NullImporter_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3085 {"find_module", (PyCFunction)NullImporter_find_module, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3086 "Always return None"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3087 },
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3088 {NULL} /* Sentinel */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3089 };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3090
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3091
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	3092 PyTypeObject PyNullImporter_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3093 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3094 "imp.NullImporter", /tp_name/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3095 sizeof(NullImporter), /tp_basicsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3096 0, /tp_itemsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3097 0, /tp_dealloc/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3098 0, /tp_print/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3099 0, /tp_getattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3100 0, /tp_setattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3101 0, /tp_reserved/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3102 0, /tp_repr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3103 0, /tp_as_number/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3104 0, /tp_as_sequence/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3105 0, /tp_as_mapping/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3106 0, /tp_hash /
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3107 0, /tp_call/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3108 0, /tp_str/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3109 0, /tp_getattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3110 0, /tp_setattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3111 0, /tp_as_buffer/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3112 Py_TPFLAGS_DEFAULT, /tp_flags/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3113 "Null importer object", /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3114 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3115 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3116 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3117 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3118 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3119 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3120 NullImporter_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3121 0, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3122 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3123 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3124 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3125 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3126 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3127 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3128 (initproc)NullImporter_init, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3129 0, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3130 PyType_GenericNew /* tp_new */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3131 };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3132
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3133 static struct PyModuleDef impmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3134 PyModuleDef_HEAD_INIT,
76331 d777f854a66e Issue #13959: Rename imp to _imp and add Lib/imp.py and begin Brett Cannon <brett@python.org> parents: 76329 diff changeset	3135 "_imp",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3136 doc_imp,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3137 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3138 imp_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3139 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3140 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3141 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3142 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3143 };
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	3144
30311 f003e48f562d Bug #794140: cygwin builds do not embed Jason Tishler <jason@tishler.net> parents: 29812 diff changeset	3145 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	3146 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	3147 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3148 PyObject m, d;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3149
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3150 if (PyType_Ready(&PyNullImporter_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3151 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3152
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3153 m = PyModule_Create(&impmodule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3154 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3155 goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3156 d = PyModule_GetDict(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3157 if (d == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3158 goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3159
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3160 if (setint(d, "SEARCH_ERROR", SEARCH_ERROR) < 0) goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3161 if (setint(d, "PY_SOURCE", PY_SOURCE) < 0) goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3162 if (setint(d, "PY_COMPILED", PY_COMPILED) < 0) goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3163 if (setint(d, "C_EXTENSION", C_EXTENSION) < 0) goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3164 if (setint(d, "PY_RESOURCE", PY_RESOURCE) < 0) goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3165 if (setint(d, "PKG_DIRECTORY", PKG_DIRECTORY) < 0) goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3166 if (setint(d, "C_BUILTIN", C_BUILTIN) < 0) goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3167 if (setint(d, "PY_FROZEN", PY_FROZEN) < 0) goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3168 if (setint(d, "PY_CODERESOURCE", PY_CODERESOURCE) < 0) goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3169 if (setint(d, "IMP_HOOK", IMP_HOOK) < 0) goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3170
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3171 Py_INCREF(&PyNullImporter_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3172 PyModule_AddObject(m, "NullImporter", (PyObject *)&PyNullImporter_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3173 return m;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3174 failure:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3175 Py_XDECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3176 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	3177 }
8330 7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3178
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3179
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12543 diff changeset	3180 /* 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	3181 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	3182 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	3183 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	3184
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3185 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	3186
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3187 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3188 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	3189 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3190 static struct _inittab *our_copy = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3191 struct _inittab *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3192 int i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3193
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3194 /* Count the number of entries in both tables */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3195 for (n = 0; newtab[n].name != NULL; n++)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3196 ;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3197 if (n == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3198 return 0; /* Nothing to do */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3199 for (i = 0; PyImport_Inittab[i].name != NULL; i++)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3200 ;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3201
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3202 /* Allocate new memory for the combined table */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3203 p = our_copy;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3204 PyMem_RESIZE(p, struct _inittab, i+n+1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3205 if (p == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3206 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3207
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3208 /* Copy the tables into the new memory */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3209 if (our_copy != PyImport_Inittab)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3210 memcpy(p, PyImport_Inittab, (i+1) * sizeof(struct _inittab));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3211 PyImport_Inittab = our_copy = p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3212 memcpy(p+i, newtab, (n+1) * sizeof(struct _inittab));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3213
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3214 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	3215 }
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3216
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3217 /* 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	3218
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	3219 int
52721 54e093bd887e Merged revisions 71031 via svnmerge from Brett Cannon <bcannon@gmail.com> parents: 52547 diff changeset	3220 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	3221 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3222 struct _inittab newtab[2];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3223
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3224 memset(newtab, '\0', sizeof newtab);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3225
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3226 newtab[0].name = (char *)name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3227 newtab[0].initfunc = initfunc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3228
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3229 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	3230 }
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	3231
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	3232 #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	3233 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	3234 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/import.c @ 76451:ea46ebba8a0f