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

annotate Python/import.c @ 73592:a16d2a8a07cc

Catch PyUnicode_AS_UNICODE() errors

author	Victor Stinner <victor.stinner@haypocalc.com>
date	Thu, 17 Nov 2011 00:45:54 +0100
parents	cea2d28f2855
children	e1dbc72bd97f

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
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	106 */
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52721 diff changeset	107
64638 20a2153b0dda Fix incorrect comment regarding MAGIC and TAG in import.c Nick Coghlan <ncoghlan@gmail.com> parents: 64621 diff changeset	108 /* 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	109 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	110 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	111 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	112 care of any bytecode changes that occur during development.
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	113 */
70631 d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	114 #define QUOTE(arg) #arg
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	115 #define STRIFY(name) QUOTE(name)
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	116 #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	117 #define MINOR STRIFY(PY_MINOR_VERSION)
70894 9a6d9ac6fb2e bump magic for super closure change Benjamin Peterson <benjamin@python.org> parents: 70631 diff changeset	118 #define MAGIC (3190 \| ((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	119 #define TAG "cpython-" MAJOR MINOR;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	120 #define CACHEDIR "__pycache__"
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	121 /* Current magic word and string tag as globals. */
12543 c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	122 static long pyc_magic = MAGIC;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	123 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	124 #undef QUOTE
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	125 #undef STRIFY
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	126 #undef MAJOR
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	127 #undef MINOR
12543 c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	128
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	129 /* 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	130 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	131
69148 7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	132 /* 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	133 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	134
6541 b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	135 /* 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	136 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	137
b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	138 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	139
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	140 /* 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	141 struct filedescr * _PyImport_Filetab = NULL;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 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 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	144 {".py", "U", PY_SOURCE},
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23879 diff changeset	145 #ifdef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	146 {".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	147 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	148 {".pyc", "rb", PY_COMPILED},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	149 {0, 0}
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	150 };
5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	151
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	152 static PyObject *initstr = NULL;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72866 diff changeset	153 _Py_IDENTIFIER(__path__);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	154
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	155 /* Initialize things */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	156
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	157 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	158 _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	159 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	160 const struct filedescr *scan;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	161 struct filedescr *filetab;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	162 int countD = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	163 int countS = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	164
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	165 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	166 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	167 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	168
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	169 /* prepare _PyImport_Filetab: copy entries from
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	170 _PyImport_DynLoadFiletab and _PyImport_StandardFiletab.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	171 */
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	172 #ifdef HAVE_DYNAMIC_LOADING
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	173 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	174 ++countD;
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	175 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	176 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	177 ++countS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	178 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	179 if (filetab == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	180 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	181 #ifdef HAVE_DYNAMIC_LOADING
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	182 memcpy(filetab, _PyImport_DynLoadFiletab,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	183 countD * sizeof(struct filedescr));
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	184 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	185 memcpy(filetab + countD, _PyImport_StandardFiletab,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	186 countS * sizeof(struct filedescr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	187 filetab[countD + countS].suffix = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	188
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	189 _PyImport_Filetab = filetab;
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 if (Py_OptimizeFlag) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	192 /* 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	193 for (; filetab->suffix != NULL; filetab++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	194 if (strcmp(filetab->suffix, ".pyc") == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	195 filetab->suffix = ".pyo";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	196 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	197 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	198 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	199
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	200 void
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	201 _PyImportHooks_Init(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	202 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	203 PyObject v, path_hooks = NULL, *zimpimport;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	204 int err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	205
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	206 /* adding sys.path_hooks and sys.path_importer_cache, setting up
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	207 zipimport */
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
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	211 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	212 PySys_WriteStderr("# installing zipimport hook\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	213
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	214 v = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	215 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	216 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	217 err = PySys_SetObject("meta_path", v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	218 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	219 if (err)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	220 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	221 v = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	222 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	223 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	224 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	225 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	226 if (err)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	227 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	228 path_hooks = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	229 if (path_hooks == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	230 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	231 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	232 if (err) {
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	233 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	234 PyErr_Print();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	235 Py_FatalError("initializing sys.meta_path, sys.path_hooks, "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	236 "path_importer_cache, or NullImporter failed"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	237 );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	238 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	239
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	240 zimpimport = PyImport_ImportModule("zipimport");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	241 if (zimpimport == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	242 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	243 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	244 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	245 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	246 else {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72866 diff changeset	247 _Py_IDENTIFIER(zipimporter);
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	248 PyObject *zipimporter = _PyObject_GetAttrId(zimpimport,
81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	249 &PyId_zipimporter);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	250 Py_DECREF(zimpimport);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	251 if (zipimporter == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	252 PyErr_Clear(); /* No zipimporter object -- okay */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	253 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	254 PySys_WriteStderr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	255 "# can't import zipimport.zipimporter\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	256 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	257 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	258 /* sys.path_hooks.append(zipimporter) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	259 err = PyList_Append(path_hooks, zipimporter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	260 Py_DECREF(zipimporter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	261 if (err)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	262 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	263 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	264 PySys_WriteStderr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	265 "# installed zipimport hook\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	266 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	267 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	268 Py_DECREF(path_hooks);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	269 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	270
7533 ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	271 /* 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	272 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	273 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	274
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	275 #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	276
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9187 diff changeset	277 #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	278
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9431 diff changeset	279 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	280 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	281 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	282
56382 2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	283 void
2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	284 _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	285 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	286 long me = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	287 if (me == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	288 return; /* Too bad */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	289 if (import_lock == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	290 import_lock = PyThread_allocate_lock();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	291 if (import_lock == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	292 return; /* Nothing much we can do. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	293 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	294 if (import_lock_thread == me) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	295 import_lock_level++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	296 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	297 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	298 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	299 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	300 PyThreadState *tstate = PyEval_SaveThread();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	301 PyThread_acquire_lock(import_lock, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	302 PyEval_RestoreThread(tstate);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	303 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	304 import_lock_thread = me;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	305 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	306 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	307
56382 2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	308 int
2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	309 _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	310 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	311 long me = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	312 if (me == -1 \|\| import_lock == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	313 return 0; /* Too bad */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	314 if (import_lock_thread != me)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	315 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	316 import_lock_level--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	317 if (import_lock_level == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	318 import_lock_thread = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	319 PyThread_release_lock(import_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	320 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	321 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	322 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	323
59235 58c35495a934 Merged revisions 78527,78550 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 59213 diff changeset	324 /* 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	325 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	326 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	327 (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	328
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	329 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	330 _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	331 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	332 if (import_lock != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	333 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	334 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	335 /* 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	336 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	337 PyThread_acquire_lock(import_lock, 0);
68708 a9d6c7e15456 import.c: replace tab by spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 68258 diff changeset	338 /* 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	339 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	340 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	341 } 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	342 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	343 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	344 }
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	345 }
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	346
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	347 #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	348
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	349 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	350 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	351 {
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	352 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	353 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	354 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	355 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	356 #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	357 }
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	358
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	359 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	360 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	361 {
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	362 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	363 _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	364 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	365 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	366 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	367 }
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	368
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	369 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	370 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	371 {
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	372 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	373 if (_PyImport_ReleaseLock() < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	374 PyErr_SetString(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	375 "not holding the import lock");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	376 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 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 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	379 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	380 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	381 }
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	382
73205 608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	383 void
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	384 _PyImport_Fini(void)
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	385 {
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	386 Py_XDECREF(extensions);
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	387 extensions = NULL;
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	388 PyMem_DEL(_PyImport_Filetab);
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	389 _PyImport_Filetab = NULL;
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	390 #ifdef WITH_THREAD
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	391 if (import_lock != NULL) {
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	392 PyThread_free_lock(import_lock);
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	393 import_lock = NULL;
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	394 }
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	395 #endif
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	396 }
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 72453 diff changeset	397
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	398 static void
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	399 imp_modules_reloading_clear(void)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	400 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	401 PyInterpreterState *interp = PyThreadState_Get()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	402 if (interp->modules_reloading != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	403 PyDict_Clear(interp->modules_reloading);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	404 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	405
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	406 /* Helper for sys */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	407
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	408 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	409 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	410 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	411 PyInterpreterState *interp = PyThreadState_GET()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	412 if (interp->modules == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	413 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	414 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	415 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	416
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	417
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	418 /* 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	419 static char* sys_deletes[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	420 "path", "argv", "ps1", "ps2",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	421 "last_type", "last_value", "last_traceback",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	422 "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	423 /* misc stuff */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	424 "flags", "float_info",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	425 NULL
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	426 };
fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	427
7403 185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	428 static char* sys_files[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	429 "stdin", "__stdin__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	430 "stdout", "__stdout__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	431 "stderr", "__stderr__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	432 NULL
7403 185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	433 };
185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	434
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 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 /* Un-initialize things, as good as we can */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	437
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	438 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	439 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	440 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	441 Py_ssize_t pos, ndone;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	442 PyObject key, value, *dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	443 PyInterpreterState *interp = PyThreadState_GET()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	444 PyObject *modules = interp->modules;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	445
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	446 if (modules == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	447 return; /* Already done */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	448
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	449 /* 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	450 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	451 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	452 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	453 destruction order. Sigh. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	454
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	455 value = PyDict_GetItemString(modules, "builtins");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	456 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	457 dict = PyModule_GetDict(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	458 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	459 PySys_WriteStderr("# clear builtins._\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	460 PyDict_SetItemString(dict, "_", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	461 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	462 value = PyDict_GetItemString(modules, "sys");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	463 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	464 char **p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	465 PyObject *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	466 dict = PyModule_GetDict(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	467 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	468 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	469 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	470 PyDict_SetItemString(dict, *p, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	471 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	472 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	473 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	474 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	475 v = PyDict_GetItemString(dict, *(p+1));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	476 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	477 v = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	478 PyDict_SetItemString(dict, *p, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	479 }
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
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	482 /* First, delete __main__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	483 value = PyDict_GetItemString(modules, "__main__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	484 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	485 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	486 PySys_WriteStderr("# cleanup __main__\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	487 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	488 PyDict_SetItemString(modules, "__main__", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	489 }
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 /* 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	492 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	493 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	494 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	495 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	496 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	497 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	498
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	499 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	500 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	501 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	502 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	503 re-imported. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	504
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	505 /* 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	506 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	507 do {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	508 ndone = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	509 pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	510 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	511 if (value->ob_refcnt != 1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	512 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	513 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	514 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	515 continue;
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	516 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	517 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	518 if (Py_VerboseFlag)
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	519 PySys_FormatStderr(
b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	520 "# cleanup[1] %U\n", key);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	521 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	522 PyDict_SetItem(modules, key, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	523 ndone++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	524 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	525 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	526 } while (ndone > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	527
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	528 /* 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	529 pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	530 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	531 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	532 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	533 continue;
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	534 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	535 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	536 if (Py_VerboseFlag)
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	537 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	538 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	539 PyDict_SetItem(modules, key, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	540 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	541 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	542
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	543 /* 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	544 value = PyDict_GetItemString(modules, "sys");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	545 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	546 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	547 PySys_WriteStderr("# cleanup sys\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	548 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	549 PyDict_SetItemString(modules, "sys", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	550 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	551 value = PyDict_GetItemString(modules, "builtins");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	552 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	553 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	554 PySys_WriteStderr("# cleanup builtins\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	555 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	556 PyDict_SetItemString(modules, "builtins", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	557 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	558
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	559 /* 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	560 PyDict_Clear(modules);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	561 interp->modules = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	562 Py_DECREF(modules);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	563 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	564 }
166 28923e44254c Added forward declaration (to satisfy Standard C). Guido van Rossum <guido@python.org> parents: 145 diff changeset	565
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	566
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	567 /* 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	568
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	569 long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	570 PyImport_GetMagicNumber(void)
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	571 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	572 return pyc_magic;
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	573 }
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	574
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	575
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	576 const char *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	577 PyImport_GetMagicTag(void)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	578 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	579 return pyc_tag;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	580 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	581
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	582 /* 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	583 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	584 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	585 (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	586 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	587 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	588 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	589 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	590 _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	591
62385 46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	592 Modules which do support multiple initialization set their m_size
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	593 field to a non-negative number (indicating the size of the
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	594 module-specific state). They are still recorded in the extensions
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	595 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	596 */
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	597
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	598 int
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	599 _PyImport_FixupExtensionObject(PyObject mod, PyObject name,
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	600 PyObject *filename)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	601 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	602 PyObject modules, dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	603 struct PyModuleDef *def;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	604 if (extensions == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	605 extensions = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	606 if (extensions == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	607 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	608 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	609 if (mod == NULL \|\| !PyModule_Check(mod)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	610 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	611 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	612 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	613 def = PyModule_GetDef(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	614 if (!def) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	615 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	616 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	617 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	618 modules = PyImport_GetModuleDict();
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	619 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	620 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	621 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	622 PyDict_DelItem(modules, name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	623 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	624 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	625 if (def->m_size == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	626 if (def->m_base.m_copy) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	627 /* Somebody already imported the module,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	628 likely under a different name.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	629 XXX this should really not happen. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	630 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	631 def->m_base.m_copy = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	632 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	633 dict = PyModule_GetDict(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	634 if (dict == NULL)
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 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	637 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	638 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	639 }
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	640 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	641 return 0;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	642 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	643
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	644 int
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	645 _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	646 {
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	647 int res;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	648 PyObject *nameobj;
68713 ced52fcd95f6 Issue #3080: Use PyUnicode_InternFromString() for builtins Victor Stinner <victor.stinner@haypocalc.com> parents: 68712 diff changeset	649 nameobj = PyUnicode_InternFromString(name);
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	650 if (nameobj == NULL)
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	651 return -1;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	652 res = _PyImport_FixupExtensionObject(mod, nameobj, nameobj);
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	653 Py_DECREF(nameobj);
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	654 return res;
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	655 }
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	656
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	657 PyObject *
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	658 _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	659 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	660 PyObject mod, mdict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	661 PyModuleDef* def;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	662 if (extensions == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	663 return NULL;
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	664 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	665 if (def == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	666 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	667 if (def->m_size == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	668 /* Module does not support repeated initialization */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	669 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	670 return NULL;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	671 mod = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	672 if (mod == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	673 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	674 mdict = PyModule_GetDict(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	675 if (mdict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	676 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	677 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	678 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	679 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	680 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	681 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	682 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	683 mod = def->m_base.m_init();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	684 if (mod == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	685 return NULL;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	686 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	687 Py_DECREF(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	688 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	689 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	690 PyDict_DelItem(PyImport_GetModuleDict(), name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	691 Py_DECREF(mod);
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 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	694 if (Py_VerboseFlag)
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	695 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	696 name, filename);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	697 return mod;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	698
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	699 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	700
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	701 PyObject *
68110 44cc9ef43127 Issue #3080: Mark _PyImport_FindBuiltin() argument as constant Victor Stinner <victor.stinner@haypocalc.com> parents: 68107 diff changeset	702 _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	703 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	704 PyObject res, nameobj;
68713 ced52fcd95f6 Issue #3080: Use PyUnicode_InternFromString() for builtins Victor Stinner <victor.stinner@haypocalc.com> parents: 68712 diff changeset	705 nameobj = PyUnicode_InternFromString(name);
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	706 if (nameobj == NULL)
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	707 return NULL;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	708 res = _PyImport_FindExtensionObject(nameobj, nameobj);
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	709 Py_DECREF(nameobj);
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	710 return res;
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	711 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	712
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	713 /* 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	714 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	715 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	716 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	717 '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	718
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	719 PyObject *
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	720 PyImport_AddModuleObject(PyObject *name)
40 f28ac7f621c7 Added reload() functionality. Guido van Rossum <guido@python.org> parents: 6 diff changeset	721 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	722 PyObject *modules = PyImport_GetModuleDict();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	723 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	724
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	725 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	726 PyModule_Check(m))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	727 return m;
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	728 m = PyModule_NewObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	729 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	730 return NULL;
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	731 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	732 Py_DECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	733 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	734 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	735 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	736
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	737 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	738 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	739
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	740 PyObject *
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	741 PyImport_AddModule(const char *name)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	742 {
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	743 PyObject nameobj, module;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	744 nameobj = PyUnicode_FromString(name);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	745 if (nameobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	746 return NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	747 module = PyImport_AddModuleObject(nameobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	748 Py_DECREF(nameobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	749 return module;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	750 }
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	751
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	752
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	753 /* 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	754 static void
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	755 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	756 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	757 PyObject *modules = PyImport_GetModuleDict();
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	758 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	759 return;
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	760 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	761 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	762 "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	763 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	764
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	765 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	766 static PyObject make_source_pathname(PyObject pathname);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	767 static PyObject* make_compiled_pathname(PyObject *pathname, int debug);
44583 73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	768
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	769 /* 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	770 * 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	771 * 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	772 * 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	773 * 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	774 * example.
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	775 *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	776 * Note that PyImport_ExecCodeModuleWithPathnames() is the preferred, richer
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	777 * 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	778 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	779 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	780 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	781 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	782 return PyImport_ExecCodeModuleWithPathnames(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	783 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	784 }
74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	785
74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	786 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	787 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	788 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	789 return PyImport_ExecCodeModuleWithPathnames(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	790 name, co, pathname, (char *)NULL);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	791 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	792
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	793 PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	794 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	795 char *cpathname)
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	796 {
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	797 PyObject *m = NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	798 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	799
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	800 nameobj = PyUnicode_FromString(name);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	801 if (nameobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	802 return NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	803
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	804 if (pathname != NULL) {
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	805 pathobj = PyUnicode_DecodeFSDefault(pathname);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	806 if (pathobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	807 goto error;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	808 } else
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	809 pathobj = NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	810 if (cpathname != NULL) {
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	811 cpathobj = PyUnicode_DecodeFSDefault(cpathname);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	812 if (cpathobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	813 goto error;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	814 } else
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	815 cpathobj = NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	816 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	817 error:
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	818 Py_DECREF(nameobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	819 Py_XDECREF(pathobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	820 Py_XDECREF(cpathobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	821 return m;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	822 }
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	823
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	824 PyObject*
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	825 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	826 PyObject *cpathname)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	827 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	828 PyObject *modules = PyImport_GetModuleDict();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	829 PyObject m, d, *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	830
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	831 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	832 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	833 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	834 /* 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	835 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	836 d = PyModule_GetDict(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	837 if (PyDict_GetItemString(d, "__builtins__") == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	838 if (PyDict_SetItemString(d, "__builtins__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	839 PyEval_GetBuiltins()) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	840 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	841 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	842 /* 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	843 if (pathname != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	844 v = get_sourcefile(pathname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	845 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	846 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	847 }
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	848 else
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	849 v = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	850 if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	851 v = ((PyCodeObject *)co)->co_filename;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	852 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	853 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	854 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	855 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	856 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	857
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	858 /* 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	859 if (cpathname != NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	860 v = cpathname;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	861 else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	862 v = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	863 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	864 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	865
66664 62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 66650 diff changeset	866 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	867 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	868 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	869 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	870
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	871 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	872 PyErr_Format(PyExc_ImportError,
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	873 "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	874 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	875 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	876 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	877
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	878 Py_INCREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	879
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	880 return m;
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	881
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	882 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	883 remove_module(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	884 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	885 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	886
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	887
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	888 /* Like strrchr(string, '/') but searches for the rightmost of either SEP
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	889 or ALTSEP, if the latter is defined.
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	890 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	891 static Py_UCS4*
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	892 rightmost_sep(Py_UCS4 *s)
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	893 {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	894 Py_UCS4 *found, c;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	895 for (found = NULL; (c = *s); s++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	896 if (c == SEP
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	897 #ifdef ALTSEP
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	898 \|\| c == ALTSEP
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	899 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	900 )
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	901 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	902 found = s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	903 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	904 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	905 return found;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	906 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	907
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	908 /* 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	909 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	910 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	911 {
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	912 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	913 Py_UCS4 c;
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	914 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	915 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	916 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	917 #ifdef ALTSEP
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	918 \|\| c == ALTSEP
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	919 #endif
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	920 )
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 found = i;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	923 }
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	924 }
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	925 return found;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	926 }
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	927
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	928 /* Given a pathname for a Python source file, fill a buffer with the
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	929 pathname for the corresponding compiled file. Return the pathname
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	930 for the compiled file, or NULL if there's no space in the buffer.
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	931 Doesn't set an exception.
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	932
73064 fdb0ccf1f4b3 Add ready checks for make_compiled_pathname. Martin v. Löwis <martin@v.loewis.de> parents: 73063 diff changeset	933 foo.py -> __pycache__/foo.<tag>.pyc
fdb0ccf1f4b3 Add ready checks for make_compiled_pathname. Martin v. Löwis <martin@v.loewis.de> parents: 73063 diff changeset	934
fdb0ccf1f4b3 Add ready checks for make_compiled_pathname. Martin v. Löwis <martin@v.loewis.de> parents: 73063 diff changeset	935 pathstr is assumed to be "ready".
fdb0ccf1f4b3 Add ready checks for make_compiled_pathname. Martin v. Löwis <martin@v.loewis.de> parents: 73063 diff changeset	936 */
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	937
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	938 static PyObject*
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	939 make_compiled_pathname(PyObject *pathstr, int debug)
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	940 {
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	941 PyObject *result;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	942 Py_ssize_t fname, ext, len, i, pos, taglen;
73066 4cfff313ce65 Drop unused macros. Use CACHEDIR consistently. Martin v. Löwis <martin@v.loewis.de> parents: 73065 diff changeset	943 Py_ssize_t pycache_len = sizeof(CACHEDIR) - 1;
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	944 int kind;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	945 void *data;
73110 63ffa07f9258 Fix test_imp failure under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 73068 diff changeset	946 Py_UCS4 lastsep;
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	947
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	948 /* Compute the output string size. */
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	949 len = PyUnicode_GET_LENGTH(pathstr);
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	950 /* If there is no separator, this returns -1, so
73110 63ffa07f9258 Fix test_imp failure under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 73068 diff changeset	951 fname will be 0. */
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	952 fname = rightmost_sep_obj(pathstr, 0, len) + 1;
73110 63ffa07f9258 Fix test_imp failure under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 73068 diff changeset	953 /* Windows: re-use the last separator character (/ or \\) when
63ffa07f9258 Fix test_imp failure under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 73068 diff changeset	954 appending the __pycache__ path. */
63ffa07f9258 Fix test_imp failure under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 73068 diff changeset	955 if (fname > 0)
63ffa07f9258 Fix test_imp failure under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 73068 diff changeset	956 lastsep = PyUnicode_READ_CHAR(pathstr, fname -1);
63ffa07f9258 Fix test_imp failure under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 73068 diff changeset	957 else
63ffa07f9258 Fix test_imp failure under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 73068 diff changeset	958 lastsep = SEP;
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	959 ext = fname - 1;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	960 for(i = fname; i < len; i++)
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	961 if (PyUnicode_READ_CHAR(pathstr, i) == '.')
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	962 ext = i + 1;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	963 if (ext < fname)
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	964 /* No dot in filename; use entire filename */
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	965 ext = len;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	966
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	967 /* result = pathstr[:fname] + "__pycache__" + SEP +
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	968 pathstr[fname:ext] + tag + ".py[co]" */
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	969 taglen = strlen(pyc_tag);
73067 17d046568f0c Fix off-by-one error. Martin v. Löwis <martin@v.loewis.de> parents: 73066 diff changeset	970 result = PyUnicode_New(ext + pycache_len + 1 + taglen + 4,
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	971 PyUnicode_MAX_CHAR_VALUE(pathstr));
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	972 if (!result)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	973 return NULL;
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	974 kind = PyUnicode_KIND(result);
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	975 data = PyUnicode_DATA(result);
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	976 PyUnicode_CopyCharacters(result, 0, pathstr, 0, fname);
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	977 pos = fname;
73067 17d046568f0c Fix off-by-one error. Martin v. Löwis <martin@v.loewis.de> parents: 73066 diff changeset	978 for (i = 0; i < pycache_len; i++)
73066 4cfff313ce65 Drop unused macros. Use CACHEDIR consistently. Martin v. Löwis <martin@v.loewis.de> parents: 73065 diff changeset	979 PyUnicode_WRITE(kind, data, pos++, CACHEDIR[i]);
73110 63ffa07f9258 Fix test_imp failure under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 73068 diff changeset	980 PyUnicode_WRITE(kind, data, pos++, lastsep);
73063 1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	981 PyUnicode_CopyCharacters(result, pos, pathstr,
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	982 fname, ext - fname);
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	983 pos += ext - fname;
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	984 for (i = 0; pyc_tag[i]; i++)
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	985 PyUnicode_WRITE(kind, data, pos++, pyc_tag[i]);
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	986 PyUnicode_WRITE(kind, data, pos++, '.');
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	987 PyUnicode_WRITE(kind, data, pos++, 'p');
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	988 PyUnicode_WRITE(kind, data, pos++, 'y');
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	989 PyUnicode_WRITE(kind, data, pos++, debug ? 'c' : 'o');
1959b2332c6a Reformulate make_compiled_pathname in terms of unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 72960 diff changeset	990 return result;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	991 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	992
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	993
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	994 /* 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	995 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	996 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	997 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	998 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	999
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1000 (...)/__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	1001
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1002 static PyObject*
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1003 make_source_pathname(PyObject *path)
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	1004 {
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1005 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	1006 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	1007 PyObject *result;
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1008 int kind;
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1009 void *data;
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1010
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1011 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	1012 if (len > MAXPATHLEN)
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1013 return NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1014
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1015 /* 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	1016 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	1017 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	1018 */
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1019 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	1020 if (right == -1)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1021 return NULL;
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1022 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	1023 if (left == -1)
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1024 left = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1025 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1026 left++;
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1027 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	1028 return NULL;
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1029 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	1030 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	1031 return NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1032
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1033 /* 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	1034 has two dots in it.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1035 */
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1036 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	1037 if (dot0 < 0)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1038 return NULL;
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1039 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	1040 if (dot1 < 0)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1041 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1042 /* Too many dots? */
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1043 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	1044 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1045
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1046 /* 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	1047 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	1048 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	1049 suffix.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1050 */
73065 6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1051 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	1052 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	1053 if (!result)
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1054 return NULL;
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1055 kind = PyUnicode_KIND(result);
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1056 data = PyUnicode_DATA(result);
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1057 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	1058 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	1059 (j = dot0-right));
6fa4386d48a9 Rewrite make_source_pathname using Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73064 diff changeset	1060 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	1061 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	1062 return result;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	1063 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	1064
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1065 /* Given a pathname for a Python source file, its time of last
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1066 modification, and a pathname for a compiled file, check whether the
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1067 compiled file represents the same version of the source. If so,
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1068 return a FILE pointer for the compiled file, positioned just after
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1069 the header; if not, return NULL.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1070 Doesn't set an exception. */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1071
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1072 static FILE *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1073 check_compiled_module(PyObject pathname, time_t mtime, PyObject cpathname)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1074 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1075 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1076 long magic;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1077 long pyc_mtime;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1078
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1079 fp = _Py_fopen(cpathname, "rb");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1080 if (fp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1081 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1082 magic = PyMarshal_ReadLongFromFile(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1083 if (magic != pyc_magic) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1084 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1085 PySys_FormatStderr("# %R has bad magic\n", cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1086 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1087 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1088 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1089 pyc_mtime = PyMarshal_ReadLongFromFile(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1090 if (pyc_mtime != mtime) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1091 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1092 PySys_FormatStderr("# %R has bad mtime\n", cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1093 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1094 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1095 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1096 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1097 PySys_FormatStderr("# %R matches %R\n", cpathname, pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1098 return fp;
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	1099 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1100
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1101
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1102 /* Read a code object from a file and check it for validity */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1103
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1104 static PyCodeObject *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1105 read_compiled_module(PyObject cpathname, FILE fp)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1106 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1107 PyObject *co;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1108
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1109 co = PyMarshal_ReadLastObjectFromFile(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1110 if (co == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1111 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1112 if (!PyCode_Check(co)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1113 PyErr_Format(PyExc_ImportError,
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1114 "Non-code object in %R", cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1115 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1116 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1117 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1118 return (PyCodeObject *)co;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1119 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1120
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1121
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1122 /* Load a module from a compiled file, execute it, and return its
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	1123 module object WITH INCREMENTED REFERENCE COUNT */
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	1124
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1125 static PyObject *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1126 load_compiled_module(PyObject name, PyObject cpathname, FILE *fp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1127 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1128 long magic;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1129 PyCodeObject *co;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1130 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1131
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1132 magic = PyMarshal_ReadLongFromFile(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1133 if (magic != pyc_magic) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1134 PyErr_Format(PyExc_ImportError,
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1135 "Bad magic number in %R", cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1136 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1137 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1138 (void) PyMarshal_ReadLongFromFile(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1139 co = read_compiled_module(cpathname, fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1140 if (co == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1141 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1142 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1143 PySys_FormatStderr("import %U # precompiled from %R\n",
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1144 name, cpathname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1145 m = PyImport_ExecCodeModuleObject(name, (PyObject *)co,
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1146 cpathname, cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1147 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1148
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1149 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	1150 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1151
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1152 /* Parse a source file and return the corresponding code object */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1153
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1154 static PyCodeObject *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1155 parse_source_module(PyObject pathname, FILE fp)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1156 {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1157 PyCodeObject *co;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1158 PyObject *pathbytes;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1159 mod_ty mod;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1160 PyCompilerFlags flags;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1161 PyArena *arena;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1162
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1163 pathbytes = PyUnicode_EncodeFSDefault(pathname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1164 if (pathbytes == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1165 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1166
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1167 arena = PyArena_New();
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1168 if (arena == NULL) {
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1169 Py_DECREF(pathbytes);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1170 return NULL;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1171 }
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1172
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1173 flags.cf_flags = 0;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1174 mod = PyParser_ASTFromFile(fp, PyBytes_AS_STRING(pathbytes), NULL,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1175 Py_file_input, 0, 0, &flags,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1176 NULL, arena);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1177 if (mod != NULL)
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1178 co = PyAST_Compile(mod, PyBytes_AS_STRING(pathbytes), NULL, arena);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1179 else
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1180 co = NULL;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1181 Py_DECREF(pathbytes);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1182 PyArena_Free(arena);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1183 return co;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1184 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1185
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1186 /* Write a compiled module to a file, placing the time of last
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1187 modification of its source into the header.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1188 Errors are ignored, if a write error occurs an attempt is made to
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1189 remove the file. */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1190
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1191 static void
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1192 write_compiled_module(PyCodeObject co, PyObject cpathname,
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1193 struct stat *srcstat)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1194 {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1195 Py_UCS4 *cpathname_ucs4;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1196 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1197 time_t mtime = srcstat->st_mtime;
73577 cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1198 PyObject *cpathname_tmp;
55331 c7042127196a Merged revisions 74058 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 52721 diff changeset	1199 #ifdef MS_WINDOWS /* since Windows uses different permissions */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1200 mode_t mode = srcstat->st_mode & ~S_IEXEC;
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1201 wchar_t wdirname, wpathname, *wpathname_tmp;
55331 c7042127196a Merged revisions 74058 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 52721 diff changeset	1202 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1203 mode_t dirmode = (srcstat->st_mode \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1204 S_IXUSR \| S_IXGRP \| S_IXOTH \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1205 S_IWUSR \| S_IWGRP \| S_IWOTH);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1206 PyObject *dirbytes;
72960 c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1207 PyObject cpathbytes, cpathbytes_tmp;
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1208 #endif
73477 a9f10c3eff69 Issue #13303: Fix bytecode file default permission. Charles-François Natali <neologix@free.fr> parents: 73324 diff changeset	1209 int fd;
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1210 PyObject *dirname;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1211 Py_UCS4 *dirsep;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1212 int res, ok;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1213
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1214 /* Ensure that the __pycache__ directory exists. */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1215 cpathname_ucs4 = PyUnicode_AsUCS4Copy(cpathname);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1216 if (!cpathname_ucs4)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1217 return;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1218 dirsep = rightmost_sep(cpathname_ucs4);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1219 if (dirsep == NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1220 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1221 PySys_FormatStderr("# no %s path found %R\n", CACHEDIR, cpathname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1222 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1223 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1224 dirname = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1225 cpathname_ucs4,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1226 dirsep - cpathname_ucs4);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1227 PyMem_Free(cpathname_ucs4);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1228 if (dirname == NULL) {
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1229 PyErr_Clear();
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1230 return;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1231 }
64594 84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1232
84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1233 #ifdef MS_WINDOWS
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1234 wdirname = PyUnicode_AsUnicode(dirname);
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1235 if (wdirname == NULL) {
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1236 PyErr_Clear();
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1237 return;
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1238 }
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1239 res = CreateDirectoryW(wdirname, NULL);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1240 ok = (res != 0);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1241 if (!ok && GetLastError() == ERROR_ALREADY_EXISTS)
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1242 ok = 1;
64594 84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1243 #else
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1244 dirbytes = PyUnicode_EncodeFSDefault(dirname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1245 if (dirbytes == NULL) {
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1246 PyErr_Clear();
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1247 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1248 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1249 res = mkdir(PyBytes_AS_STRING(dirbytes), dirmode);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1250 Py_DECREF(dirbytes);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1251 if (0 <= res)
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1252 ok = 1;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1253 else
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1254 ok = (errno == EEXIST);
64594 84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1255 #endif
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1256 if (!ok) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1257 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1258 PySys_FormatStderr("# cannot create cache dir %R\n", dirname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1259 Py_DECREF(dirname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1260 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1261 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1262 Py_DECREF(dirname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1263
73573 b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1264 /* We first write to a tmp file and then take advantage
73577 cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1265 of atomic renaming (which should be true even under Windows).
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1266 As in importlib, we use id(something) to generate a pseudo-random
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1267 filename. mkstemp() can't be used since it doesn't allow specifying
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1268 the file access permissions.
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1269 */
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1270 cpathname_tmp = PyUnicode_FromFormat("%U.%zd",
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1271 cpathname, (Py_ssize_t) co);
73573 b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1272 if (cpathname_tmp == NULL) {
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1273 PyErr_Clear();
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1274 return;
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1275 }
73577 cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1276 #ifdef MS_WINDOWS
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1277 wpathname = PyUnicode_AsUnicode(cpathname);
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1278 if (wpathname == NULL) {
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1279 PyErr_Clear();
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1280 return;
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1281 }
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1282 wpathname_tmp = PyUnicode_AsUnicode(cpathname_tmp);
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1283 if (wpathname_tmp == NULL) {
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1284 PyErr_Clear();
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1285 return;
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1286 }
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1287
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1288 (void)DeleteFileW(wpathname_tmp);
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1289 fd = _wopen(wpathname_tmp,
73573 b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1290 O_EXCL \| O_CREAT \| O_WRONLY \| O_BINARY,
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1291 mode);
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1292 if (0 <= fd)
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1293 fp = fdopen(fd, "wb");
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1294 else
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1295 fp = NULL;
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1296 #else
73577 cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1297 cpathbytes_tmp = PyUnicode_EncodeFSDefault(cpathname_tmp);
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1298 Py_DECREF(cpathname_tmp);
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1299 if (cpathbytes_tmp == NULL) {
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1300 PyErr_Clear();
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1301 return;
cea2d28f2855 Use PyUnicode_FromFormat() to create the temporary file name. Antoine Pitrou <solipsis@pitrou.net> parents: 73574 diff changeset	1302 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1303 cpathbytes = PyUnicode_EncodeFSDefault(cpathname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1304 if (cpathbytes == NULL) {
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1305 PyErr_Clear();
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1306 return;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1307 }
73477 a9f10c3eff69 Issue #13303: Fix bytecode file default permission. Charles-François Natali <neologix@free.fr> parents: 73324 diff changeset	1308 fd = open(PyBytes_AS_STRING(cpathbytes_tmp),
a9f10c3eff69 Issue #13303: Fix bytecode file default permission. Charles-François Natali <neologix@free.fr> parents: 73324 diff changeset	1309 O_CREAT \| O_EXCL \| O_WRONLY, 0666);
73264 740baff4f169 Issue #13303: Fix a race condition in the bytecode file creation. Charles-François Natali <neologix@free.fr> parents: 73227 diff changeset	1310 if (0 <= fd)
740baff4f169 Issue #13303: Fix a race condition in the bytecode file creation. Charles-François Natali <neologix@free.fr> parents: 73227 diff changeset	1311 fp = fdopen(fd, "wb");
740baff4f169 Issue #13303: Fix a race condition in the bytecode file creation. Charles-François Natali <neologix@free.fr> parents: 73227 diff changeset	1312 else
740baff4f169 Issue #13303: Fix a race condition in the bytecode file creation. Charles-François Natali <neologix@free.fr> parents: 73227 diff changeset	1313 fp = NULL;
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1314 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1315 if (fp == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1316 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1317 PySys_FormatStderr(
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1318 "# can't create %R\n", cpathname);
73573 b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1319 #ifdef MS_WINDOWS
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1320 Py_DECREF(cpathname_tmp);
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1321 #else
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1322 Py_DECREF(cpathbytes);
72960 c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1323 Py_DECREF(cpathbytes_tmp);
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1324 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1325 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1326 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1327 PyMarshal_WriteLongToFile(pyc_magic, fp, Py_MARSHAL_VERSION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1328 /* First write a 0 for mtime */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1329 PyMarshal_WriteLongToFile(0L, fp, Py_MARSHAL_VERSION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1330 PyMarshal_WriteObjectToFile((PyObject *)co, fp, Py_MARSHAL_VERSION);
72960 c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1331 fflush(fp);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1332 /* Now write the true mtime */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1333 fseek(fp, 4L, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1334 assert(mtime < LONG_MAX);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1335 PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1336 if (fflush(fp) != 0 \|\| ferror(fp)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1337 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1338 PySys_FormatStderr("# can't write %R\n", cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1339 /* Don't keep partial file */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1340 fclose(fp);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1341 #ifdef MS_WINDOWS
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1342 (void)DeleteFileW(wpathname_tmp);
73573 b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1343 Py_DECREF(cpathname_tmp);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1344 #else
72960 c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1345 (void) unlink(PyBytes_AS_STRING(cpathbytes_tmp));
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1346 Py_DECREF(cpathbytes);
72960 c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1347 Py_DECREF(cpathbytes_tmp);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1348 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1349 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1350 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1351 fclose(fp);
73573 b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1352 /* Do a (hopefully) atomic rename */
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1353 #ifdef MS_WINDOWS
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1354 if (!MoveFileExW(wpathname_tmp, wpathname, MOVEFILE_REPLACE_EXISTING)) {
73573 b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1355 if (Py_VerboseFlag)
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1356 PySys_FormatStderr("# can't write %R\n", cpathname);
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1357 /* Don't keep tmp file */
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1358 (void) DeleteFileW(wpathname_tmp);
73573 b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1359 Py_DECREF(cpathname_tmp);
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1360 return;
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1361 }
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1362 Py_DECREF(cpathname_tmp);
b75b41237380 Issue #13392: Writing a pyc file should now be atomic under Windows as well. Antoine Pitrou <solipsis@pitrou.net> parents: 73477 diff changeset	1363 #else
72960 c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1364 if (rename(PyBytes_AS_STRING(cpathbytes_tmp),
c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1365 PyBytes_AS_STRING(cpathbytes))) {
c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1366 if (Py_VerboseFlag)
c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1367 PySys_FormatStderr("# can't write %R\n", cpathname);
c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1368 /* Don't keep tmp file */
c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1369 unlink(PyBytes_AS_STRING(cpathbytes_tmp));
c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1370 Py_DECREF(cpathbytes);
c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1371 Py_DECREF(cpathbytes_tmp);
c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1372 return;
c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1373 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1374 Py_DECREF(cpathbytes);
72960 c16063765d3a Issue #13146: Writing a pyc file is now atomic under POSIX. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	1375 Py_DECREF(cpathbytes_tmp);
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1376 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1377 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1378 PySys_FormatStderr("# wrote %R\n", cpathname);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1379 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1380
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1381 static void
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1382 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	1383 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1384 PyObject constants, tmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1385 Py_ssize_t i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1386
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1387 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	1388 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1389
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1390 tmp = co->co_filename;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1391 co->co_filename = newname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1392 Py_INCREF(co->co_filename);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1393 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1394
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1395 constants = co->co_consts;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1396 n = PyTuple_GET_SIZE(constants);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1397 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1398 tmp = PyTuple_GET_ITEM(constants, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1399 if (PyCode_Check(tmp))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1400 update_code_filenames((PyCodeObject *)tmp,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1401 oldname, newname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1402 }
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1403 }
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1404
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1405 static void
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1406 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	1407 {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1408 PyObject *oldname;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1409
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1410 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	1411 return;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1412
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1413 oldname = co->co_filename;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1414 Py_INCREF(oldname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1415 update_code_filenames(co, oldname, newname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1416 Py_DECREF(oldname);
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1417 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1418
68887 5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1419 static PyObject *
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1420 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	1421 {
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1422 PyObject *co;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1423 PyObject *file_path;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1424
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1425 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	1426 return NULL;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1427
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1428 if (!PyCode_Check(co)) {
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1429 PyErr_SetString(PyExc_TypeError,
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1430 "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	1431 return NULL;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1432 }
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1433
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1434 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	1435 PyErr_SetString(PyExc_TypeError,
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1436 "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	1437 return NULL;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1438 }
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1439
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1440 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	1441
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1442 Py_RETURN_NONE;
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1443 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1444
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1445 /* Load a source module from a given file and return its module
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	1446 object WITH INCREMENTED REFERENCE COUNT. If there's a matching
27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	1447 byte-compiled file, use that instead. */
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1448
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1449 static PyObject *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1450 load_source_module(PyObject name, PyObject pathname, FILE *fp)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1451 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1452 struct stat st;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1453 FILE *fpc;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1454 PyObject cpathname = NULL, cpathbytes = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1455 PyCodeObject *co;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1456 PyObject *m = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1457
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1458 if (fstat(fileno(fp), &st) != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1459 PyErr_Format(PyExc_RuntimeError,
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1460 "unable to get file status from %R",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1461 pathname);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1462 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1463 }
13226 12437deb0680 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13181 diff changeset	1464 #if SIZEOF_TIME_T > 4
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1465 /* Python's .pyc timestamp handling presumes that the timestamp fits
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1466 in 4 bytes. This will be fine until sometime in the year 2038,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1467 when a 4-byte signed time_t will overflow.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1468 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1469 if (st.st_mtime >> 32) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1470 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1471 "modification time overflows a 4 byte field");
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1472 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1473 }
13226 12437deb0680 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13181 diff changeset	1474 #endif
73064 fdb0ccf1f4b3 Add ready checks for make_compiled_pathname. Martin v. Löwis <martin@v.loewis.de> parents: 73063 diff changeset	1475 if (PyUnicode_READY(pathname) < 0)
fdb0ccf1f4b3 Add ready checks for make_compiled_pathname. Martin v. Löwis <martin@v.loewis.de> parents: 73063 diff changeset	1476 return NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1477 cpathname = make_compiled_pathname(pathname, !Py_OptimizeFlag);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1478
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1479 if (cpathname != NULL)
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1480 fpc = check_compiled_module(pathname, st.st_mtime, cpathname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1481 else
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1482 fpc = NULL;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1483
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1484 if (fpc) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1485 co = read_compiled_module(cpathname, fpc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1486 fclose(fpc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1487 if (co == NULL)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1488 goto error;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1489 update_compiled_module(co, pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1490 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1491 PySys_FormatStderr("import %U # precompiled from %R\n",
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1492 name, cpathname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1493 m = PyImport_ExecCodeModuleObject(name, (PyObject *)co,
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1494 cpathname, cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1495 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1496 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1497 co = parse_source_module(pathname, fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1498 if (co == NULL)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1499 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1500 if (Py_VerboseFlag)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1501 PySys_FormatStderr("import %U # from %R\n",
68738 c4361bab6914 Issue #3080: Use repr() to format the module name on error Victor Stinner <victor.stinner@haypocalc.com> parents: 68737 diff changeset	1502 name, pathname);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1503 if (cpathname != NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1504 PyObject *ro = PySys_GetObject("dont_write_bytecode");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1505 if (ro == NULL \|\| !PyObject_IsTrue(ro))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1506 write_compiled_module(co, cpathname, &st);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1507 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1508 m = PyImport_ExecCodeModuleObject(name, (PyObject *)co,
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1509 pathname, cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1510 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1511 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1512
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1513 error:
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1514 Py_XDECREF(cpathbytes);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1515 Py_XDECREF(cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1516 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	1517 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1518
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	1519 /* 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	1520 * 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	1521 */
73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	1522 static PyObject *
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1523 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	1524 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1525 Py_ssize_t len;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1526 Py_UCS4 *fileuni;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1527 PyObject *py;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1528 struct stat statbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1529
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1530 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	1531 if (len == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1532 Py_RETURN_NONE;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1533
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1534 /* don't match .pyc or .pyo? */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1535 fileuni = PyUnicode_AsUCS4Copy(filename);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1536 if (!fileuni)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1537 return NULL;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1538 if (len < 5
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1539 \|\| fileuni[len-4] != '.'
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1540 \|\| (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	1541 \|\| (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	1542 goto unchanged;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1543
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1544 /* 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	1545 * 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	1546 * to py.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1547 */
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1548 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	1549 if (py == NULL) {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1550 PyErr_Clear();
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1551 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	1552 }
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1553 if (py == NULL)
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1554 goto error;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1555
72563 1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	1556 if (_Py_stat(py, &statbuf) == 0 && S_ISREG(statbuf.st_mode)) {
1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	1557 PyMem_Free(fileuni);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1558 return py;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1559 }
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1560 Py_DECREF(py);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1561 goto unchanged;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1562
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1563 error:
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1564 PyErr_Clear();
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1565 unchanged:
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1566 PyMem_Free(fileuni);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1567 Py_INCREF(filename);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1568 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	1569 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1570
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1571 /* Forward */
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	1572 static PyObject load_module(PyObject , FILE , PyObject , int, PyObject *);
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	1573 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	1574 PyObject , FILE , PyObject **);
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1575 static struct _frozen * find_frozen(PyObject *);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1576
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1577 /* Load a package and return its module object WITH INCREMENTED
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1578 REFERENCE COUNT */
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1579
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1580 static PyObject *
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1581 load_package(PyObject name, PyObject pathname)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1582 {
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	1583 PyObject m, d, *bufobj;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1584 PyObject file = NULL, path_list = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1585 int err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1586 FILE *fp = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1587 struct filedescr *fdp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1588
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1589 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1590 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1591 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1592 if (Py_VerboseFlag)
68738 c4361bab6914 Issue #3080: Use repr() to format the module name on error Victor Stinner <victor.stinner@haypocalc.com> parents: 68737 diff changeset	1593 PySys_FormatStderr("import %U # directory %R\n",
c4361bab6914 Issue #3080: Use repr() to format the module name on error Victor Stinner <victor.stinner@haypocalc.com> parents: 68737 diff changeset	1594 name, pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1595 file = get_sourcefile(pathname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1596 if (file == NULL)
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1597 return NULL;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1598 path_list = Py_BuildValue("[O]", file);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1599 if (path_list == NULL) {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1600 Py_DECREF(file);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1601 return NULL;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1602 }
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1603 d = PyModule_GetDict(m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1604 err = PyDict_SetItemString(d, "__file__", file);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1605 Py_DECREF(file);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1606 if (err == 0)
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1607 err = PyDict_SetItemString(d, "__path__", path_list);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1608 if (err != 0) {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1609 Py_DECREF(path_list);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1610 return NULL;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1611 }
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	1612 fdp = find_module(name, initstr, path_list,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1613 &bufobj, &fp, NULL);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1614 Py_DECREF(path_list);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1615 if (fdp == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1616 if (PyErr_ExceptionMatches(PyExc_ImportError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1617 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1618 Py_INCREF(m);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1619 return m;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1620 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1621 else
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1622 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1623 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1624 m = load_module(name, fp, bufobj, fdp->type, NULL);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1625 Py_XDECREF(bufobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1626 if (fp != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1627 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1628 return m;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1629 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1630
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1631
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1632 /* Helper to test for built-in module */
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1633
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1634 static int
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1635 is_builtin(PyObject *name)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1636 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1637 int i, cmp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1638 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	1639 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	1640 if (cmp == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1641 if (PyImport_Inittab[i].initfunc == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1642 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1643 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1644 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1645 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1646 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1647 return 0;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1648 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1649
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1650
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1651 /* 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	1652 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	1653 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	1654 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	1655 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	1656 import mechanism. Cache the result in path_importer_cache.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1657 Returns a borrowed reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1658
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1659 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1660 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	1661 PyObject *p)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1662 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1663 PyObject *importer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1664 Py_ssize_t j, nhooks;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1665
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1666 /* 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	1667 assert(PyList_Check(path_hooks));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1668 assert(PyDict_Check(path_importer_cache));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1669
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1670 nhooks = PyList_Size(path_hooks);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1671 if (nhooks < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1672 return NULL; /* Shouldn't happen */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1673
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1674 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	1675 if (importer != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1676 return importer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1677
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1678 /* 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	1679 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	1680 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1681
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1682 for (j = 0; j < nhooks; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1683 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	1684 if (hook == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1685 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1686 importer = PyObject_CallFunctionObjArgs(hook, p, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1687 if (importer != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1688 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1689
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1690 if (!PyErr_ExceptionMatches(PyExc_ImportError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1691 return NULL;
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 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1694 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1695 if (importer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1696 importer = PyObject_CallFunctionObjArgs(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1697 (PyObject *)&PyNullImporter_Type, p, NULL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1698 );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1699 if (importer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1700 if (PyErr_ExceptionMatches(PyExc_ImportError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1701 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1702 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1703 }
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 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1706 if (importer != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1707 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	1708 Py_DECREF(importer);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1709 if (err != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1710 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1711 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1712 return importer;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1713 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1714
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1715 PyAPI_FUNC(PyObject *)
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1716 PyImport_GetImporter(PyObject *path) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1717 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	1718
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1719 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	1720 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	1721 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	1722 path_hooks, path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1723 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1724 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1725 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	1726 return importer;
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1727 }
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1728
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1729 /* 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	1730 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	1731 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	1732
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1733 #ifdef MS_COREDLL
68715 bab42673674a Issue #3080: _PyWin_FindRegisteredModule() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68713 diff changeset	1734 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	1735 PyObject **p_path);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1736 #endif
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1737
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1738 /* Forward */
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1739 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	1740 static int find_init_module(PyObject *);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1741 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	1742
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1743 /* 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	1744 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	1745
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1746 -1: error: a Python error occurred
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1747 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	1748 important enough to be reported.
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1749 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	1750 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	1751 and buf is the path /
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1752
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1753 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	1754 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	1755 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	1756 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	1757 {
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1758 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	1759 Py_ssize_t len, pos;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1760 struct stat statbuf;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1761 static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1762 int result, addsep;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1763
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1764 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	1765 Py_INCREF(path);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1766 path_unicode = path;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1767 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1768 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	1769 path_unicode = PyUnicode_DecodeFSDefaultAndSize(
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1770 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	1771 if (path_unicode == NULL)
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1772 return -1;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1773 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1774 else
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1775 return 0;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1776
72718 c97ba8f80935 Fix find_module_path(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72584 diff changeset	1777 if (PyUnicode_READY(path_unicode))
c97ba8f80935 Fix find_module_path(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72584 diff changeset	1778 return -1;
c97ba8f80935 Fix find_module_path(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72584 diff changeset	1779
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1780 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	1781 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	1782 result = 0;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1783 goto out; /* path contains '\0' */
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1784 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1785
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1786 /* sys.path_hooks import hook */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1787 if (p_loader != NULL) {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72866 diff changeset	1788 _Py_IDENTIFIER(find_module);
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1789 PyObject *importer;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1790
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1791 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	1792 path_hooks, path);
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1793 if (importer == NULL) {
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1794 result = -1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1795 goto out;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1796 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1797 /* Note: importer is a borrowed reference */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1798 if (importer != Py_None) {
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1799 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	1800 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	1801 &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	1802 if (loader == NULL) {
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1803 result = -1; /* error */
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1804 goto out;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1805 }
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1806 if (loader != Py_None) {
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1807 /* a loader was found */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1808 *p_loader = loader;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1809 *p_fd = &importhookdescr;
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1810 result = 2;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1811 goto out;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1812 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1813 Py_DECREF(loader);
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1814 result = 0;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1815 goto out;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1816 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1817 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1818 /* 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	1819
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1820 addsep = 0;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1821 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	1822 #ifdef ALTSEP
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1823 && 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	1824 #endif
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1825 )
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1826 addsep = 1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1827 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	1828 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	1829 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	1830 if (filename == NULL) {
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1831 result = -1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1832 goto out;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	1833 }
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1834 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	1835 pos = len;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1836 if (addsep)
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1837 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	1838 PyUnicode_DATA(filename),
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1839 pos++, SEP);
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	1840 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	1841 PyUnicode_GET_LENGTH(name));
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1842
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1843 /* 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	1844 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	1845 #ifdef HAVE_STAT
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1846 if (_Py_stat(filename, &statbuf) == 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	1847 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	1848 {
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1849 int match;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1850
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1851 match = case_ok(filename, 0, name);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1852 if (match < 0) {
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1853 result = -1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1854 goto out;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1855 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1856 if (match) { /* case matches */
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1857 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	1858 *p_path = filename;
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1859 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	1860 *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	1861 result = 2;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1862 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	1863 }
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1864 else {
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1865 int err;
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1866 err = PyErr_WarnFormat(PyExc_ImportWarning, 1,
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1867 "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	1868 filename);
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1869 if (err) {
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1870 result = -1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1871 goto out;
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1872 }
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1873 }
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1874 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1875 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1876 #endif
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1877 *p_path = filename;
73068 eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1878 filename = NULL;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1879 result = 1;
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1880 out:
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1881 Py_DECREF(path_unicode);
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1882 Py_XDECREF(filename);
eef1027ab2f0 Rewrite find_module_path using unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73067 diff changeset	1883 return result;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1884 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1885
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1886 /* 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	1887 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	1888
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1889 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	1890 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	1891 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	1892
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1893 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	1894
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1895 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	1896 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	1897 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	1898 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	1899 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	1900 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1901 Py_ssize_t i, npath;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1902 struct filedescr *fdp = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1903 char *filemode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1904 FILE *fp = NULL;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1905 PyObject prefix, filename;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1906 int match;
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1907
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1908 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	1909 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	1910 PyObject *path;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1911 int ok;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1912
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1913 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	1914 if (path == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1915 return NULL;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1916
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1917 prefix = NULL;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1918 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	1919 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	1920 &prefix, p_loader, &fdp);
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1921 if (ok < 0)
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1922 return NULL;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1923 if (ok == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1924 continue;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1925 if (ok == 2) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1926 *p_path = prefix;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1927 return fdp;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1928 }
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1929
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1930 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	1931 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	1932
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1933 filemode = fdp->mode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1934 if (filemode[0] == 'U')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1935 filemode = "r" PY_STDIOTEXTMODE;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1936
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1937 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	1938 if (filename == NULL) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1939 Py_DECREF(prefix);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1940 return NULL;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1941 }
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1942
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1943 if (Py_VerboseFlag > 1)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1944 PySys_FormatStderr("# trying %R\n", filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1945
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	1946 if (_Py_stat(filename, &statbuf) == 0 && /* it exists */
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	1947 S_ISDIR(statbuf.st_mode)) /* it's a directory */
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	1948 {
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	1949 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	1950 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	1951 }
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	1952
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1953 fp = _Py_fopen(filename, filemode);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1954 if (fp == NULL) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1955 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	1956 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	1957 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	1958 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	1959 }
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1960 continue;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1961 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1962 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	1963 if (match < 0) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1964 Py_DECREF(prefix);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1965 Py_DECREF(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1966 return NULL;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1967 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1968 if (match) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1969 Py_DECREF(prefix);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1970 *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	1971 *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	1972 return fdp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1973 }
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1974 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	1975
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1976 fclose(fp);
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1977 fp = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1978 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1979 Py_DECREF(prefix);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1980 }
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1981 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	1982 "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	1983 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	1984 }
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	1985
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1986 /* Find a module:
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1987
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1988 - 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	1989 - try find_frozen()
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1990 - try is_builtin()
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1991 - try _PyWin_FindRegisteredModule() (Windows only)
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1992 - 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	1993 NULL) or sys.path
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1994
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1995 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	1996
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1997 Return:
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1998
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1999 - &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	2000 - &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	2001 - &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	2002 if it is a package
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2003 - &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	2004 importer loader was found
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2005 - 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	2006 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	2007 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	2008 - NULL on error
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2009
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2010 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	2011 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	2012 */
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2013
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2014 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	2015 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	2016 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	2017 {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2018 Py_ssize_t i, npath;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2019 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	2020 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	2021 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	2022
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2023 *p_path = NULL;
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2024 *p_fp = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2025 if (p_loader != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2026 *p_loader = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2027
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2028 if (PyUnicode_GET_LENGTH(name) > MAXPATHLEN) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2029 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2030 "module name is too long");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2031 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2032 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2033
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2034 /* sys.meta_path import hook */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2035 if (p_loader != NULL) {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72866 diff changeset	2036 _Py_IDENTIFIER(find_module);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2037 PyObject *meta_path;
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 meta_path = PySys_GetObject("meta_path");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2040 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	2041 PyErr_SetString(PyExc_RuntimeError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2042 "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	2043 "import hooks");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2044 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2045 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2046 Py_INCREF(meta_path); /* zap guard */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2047 npath = PyList_Size(meta_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2048 for (i = 0; i < npath; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2049 PyObject *loader;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2050 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	2051 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	2052 "OO", fullname,
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2053 search_path_list != NULL ?
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2054 search_path_list : Py_None);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2055 if (loader == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2056 Py_DECREF(meta_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2057 return NULL; /* true error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2058 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2059 if (loader != Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2060 /* a loader was found */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2061 *p_loader = loader;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2062 Py_DECREF(meta_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2063 return &importhookdescr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2064 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2065 Py_DECREF(loader);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2066 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2067 Py_DECREF(meta_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2068 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2069
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	2070 if (find_frozen(fullname) != NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2071 return &fd_frozen;
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2072
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2073 if (search_path_list == NULL) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2074 #ifdef MS_COREDLL
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2075 FILE *fp;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2076 struct filedescr *fdp;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2077 #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	2078 if (is_builtin(name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2079 return &fd_builtin;
4111 90216e907345 PYTHONWIN -> MS_COREDLL Guido van Rossum <guido@python.org> parents: 3964 diff changeset	2080 #ifdef MS_COREDLL
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2081 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	2082 if (fp != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2083 *p_fp = fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2084 return fdp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2085 }
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2086 else if (PyErr_Occurred())
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2087 return NULL;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2088 #endif
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2089 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	2090 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2091
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2092 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	2093 PyErr_SetString(PyExc_RuntimeError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2094 "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	2095 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2096 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2097
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2098 path_hooks = PySys_GetObject("path_hooks");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2099 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	2100 PyErr_SetString(PyExc_RuntimeError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2101 "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	2102 "import hooks");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2103 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2104 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2105 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	2106 if (path_importer_cache == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2107 !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	2108 PyErr_SetString(PyExc_RuntimeError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2109 "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	2110 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2111 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2112
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2113 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	2114 search_path_list, path_hooks,
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2115 path_importer_cache,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2116 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	2117 }
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	2118
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2119 /* 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	2120 * 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	2121 * /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	2122 * ^ ^ ^ ^
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2123 * \|--------------------- buf ---------------------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2124 * \|------------------- len ------------------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2125 * \|------ name -------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2126 * \|----- namelen -----\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2127 * 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	2128 * 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	2129 *
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2130 * 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	2131 * 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	2132 *
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2133 * 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	2134 * 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	2135 * 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	2136 *
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2137 * 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	2138 * 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	2139 * 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	2140 * 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	2141 */
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	2142
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2143 /* 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	2144 * 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	2145 */
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	2146 #if defined(MS_WINDOWS)
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	2147 #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	2148
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2149 #elif defined(DJGPP)
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2150 #include <dir.h>
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2151
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	2152 #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	2153 #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	2154 #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	2155
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	2156 #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	2157 #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	2158 #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	2159 #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	2160 #include <os2.h>
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2161 #endif
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2162
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2163 #if defined(DJGPP) \
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2164 \|\| ((defined(__MACH__) && defined(__APPLE__) \|\| defined(__CYGWIN__)) \
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2165 && defined(HAVE_DIRENT_H)) \
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2166 \|\| defined(PYOS_OS2)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2167 # define USE_CASE_OK_BYTES
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2168 #endif
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2169
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2170
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2171 #ifdef USE_CASE_OK_BYTES
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	2172 static int
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2173 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	2174 {
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2175 /* 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	2176 * match the sequence just above.
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2177 */
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2178
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2179 /* DJGPP */
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2180 #if defined(DJGPP)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2181 struct ffblk ffblk;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2182 int done;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2183
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2184 if (Py_GETENV("PYTHONCASEOK") != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2185 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2186
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2187 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	2188 if (done) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2189 PyErr_Format(PyExc_NameError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2190 "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	2191 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	2192 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2193 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2194 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	2195
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	2196 /* new-fangled macintosh (macosx) or Cygwin */
4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	2197 #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	2198 DIR *dirp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2199 struct dirent *dp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2200 char dirname[MAXPATHLEN + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2201 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	2202
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2203 if (Py_GETENV("PYTHONCASEOK") != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2204 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2205
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2206 /* 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	2207 if (dirlen <= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2208 dirname[0] = '.';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2209 dirname[1] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2210 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2211 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2212 assert(dirlen <= MAXPATHLEN);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2213 memcpy(dirname, buf, dirlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2214 dirname[dirlen] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2215 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2216 /* 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	2217 dirp = opendir(dirname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2218 if (dirp) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2219 char *nameWithExt = buf + len - namelen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2220 while ((dp = readdir(dirp)) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2221 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	2222 #ifdef _DIRENT_HAVE_D_NAMELEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2223 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	2224 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2225 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	2226 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2227 if (thislen >= namelen &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2228 strcmp(dp->d_name, nameWithExt) == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2229 (void)closedir(dirp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2230 return 1; /* Found */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2231 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2232 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2233 (void)closedir(dirp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2234 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2235 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	2236
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	2237 /* OS/2 */
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	2238 #elif defined(PYOS_OS2)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2239 HDIR hdir = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2240 ULONG srchcnt = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2241 FILEFINDBUF3 ffbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2242 APIRET rc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2243
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2244 if (Py_GETENV("PYTHONCASEOK") != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2245 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2246
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2247 rc = DosFindFirst(buf,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2248 &hdir,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2249 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	2250 &ffbuf, sizeof(ffbuf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2251 &srchcnt,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2252 FIL_STANDARD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2253 if (rc != NO_ERROR)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2254 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2255 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	2256
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2257 /* 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	2258 #else
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2259 # 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	2260 #endif
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2261 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2262 #endif
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2263
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2264 /*
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2265 * 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	2266 * 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	2267 * possibly case-insensitive.
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2268 *
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2269 * 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	2270 * 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	2271 * if envar PYTHONCASEOK exists.
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2272 *
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2273 * 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	2274 * 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	2275 * 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	2276 * 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	2277 */
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2278
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2279 static int
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2280 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	2281 {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2282 #ifdef MS_WINDOWS
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2283 WIN32_FIND_DATAW data;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2284 HANDLE h;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2285 int cmp;
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	2286 wchar_t wfilename, wname;
72866 4be55c2c2356 Fix typo in import.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72861 diff changeset	2287 Py_ssize_t wname_len;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2288
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2289 if (Py_GETENV("PYTHONCASEOK") != NULL)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2290 return 1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2291
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	2292 wfilename = PyUnicode_AsUnicode(filename);
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	2293 if (wfilename == NULL)
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	2294 return -1;
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	2295
a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	2296 h = FindFirstFileW(wfilename, &data);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2297 if (h == INVALID_HANDLE_VALUE) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2298 PyErr_Format(PyExc_NameError,
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2299 "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	2300 name, filename);
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	2301 return -1;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2302 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2303 FindClose(h);
72861 6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	2304
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	2305 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	2306 if (wname == NULL)
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	2307 return -1;
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	2308
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	2309 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	2310 return cmp == 0;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2311 #elif defined(USE_CASE_OK_BYTES)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2312 int match;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2313 PyObject filebytes, namebytes;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2314 filebytes = PyUnicode_EncodeFSDefault(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2315 if (filebytes == NULL)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2316 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2317 namebytes = PyUnicode_EncodeFSDefault(name);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2318 if (namebytes == NULL) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2319 Py_DECREF(filebytes);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2320 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2321 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2322 match = case_bytes(
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2323 PyBytes_AS_STRING(filebytes),
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2324 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	2325 PyBytes_GET_SIZE(namebytes),
f8d6f6797909 Issue #3080: Fix case_ok() using case_bytes() Victor Stinner <victor.stinner@haypocalc.com> parents: 68739 diff changeset	2326 PyBytes_AS_STRING(namebytes));
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2327 Py_DECREF(filebytes);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2328 Py_DECREF(namebytes);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2329 return match;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2330 #else
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2331 /* 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	2332 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	2333
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2334 #endif
7305 067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	2335 }
067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	2336
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2337 #ifdef HAVE_STAT
63985 953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2338
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2339 /* 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	2340 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	2341 static int
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2342 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	2343 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2344 struct stat statbuf;
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2345 PyObject *filename;
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2346 int match;
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2347
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2348 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	2349 if (filename == NULL)
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2350 return -1;
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2351 if (_Py_stat(filename, &statbuf) == 0) {
68742 dc38c4d65cd9 Issue #3080: Fix call to case_ok() in find_init_module() Victor Stinner <victor.stinner@haypocalc.com> parents: 68741 diff changeset	2352 /* 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	2353 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	2354 if (match < 0) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2355 Py_DECREF(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2356 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2357 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2358 if (match) {
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2359 Py_DECREF(filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2360 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2361 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2362 }
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2363 Py_DECREF(filename);
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2364
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2365 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	2366 directory, SEP, Py_OptimizeFlag ? 'o' : 'c');
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2367 if (filename == NULL)
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2368 return -1;
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2369 if (_Py_stat(filename, &statbuf) == 0) {
68742 dc38c4d65cd9 Issue #3080: Fix call to case_ok() in find_init_module() Victor Stinner <victor.stinner@haypocalc.com> parents: 68741 diff changeset	2370 /* 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	2371 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	2372 if (match < 0) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2373 Py_DECREF(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2374 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2375 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2376 if (match) {
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2377 Py_DECREF(filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2378 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2379 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2380 }
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2381 Py_DECREF(filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2382 return 0;
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2383 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	2384
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2385 #endif /* HAVE_STAT */
62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2386
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	2387
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2388 static int init_builtin(PyObject ); / Forward */
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2389
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2390 static PyObject*
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2391 load_builtin(PyObject *name, int type)
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2392 {
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2393 PyObject m, modules;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2394 int err;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2395
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2396 if (type == C_BUILTIN)
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2397 err = init_builtin(name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2398 else
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2399 err = PyImport_ImportFrozenModuleObject(name);
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2400 if (err < 0)
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2401 return NULL;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2402 if (err == 0) {
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2403 PyErr_Format(PyExc_ImportError,
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2404 "Purported %s module %R not found",
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2405 type == C_BUILTIN ? "builtin" : "frozen",
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2406 name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2407 return NULL;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2408 }
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2409
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2410 modules = PyImport_GetModuleDict();
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2411 m = PyDict_GetItem(modules, name);
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2412 if (m == NULL) {
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2413 PyErr_Format(
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2414 PyExc_ImportError,
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2415 "%s module %R not properly initialized",
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2416 type == C_BUILTIN ? "builtin" : "frozen",
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2417 name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2418 return NULL;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2419 }
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2420 Py_INCREF(m);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2421 return m;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2422 }
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2423
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2424 /* Load an external module using the default search path and return
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	2425 its module object WITH INCREMENTED REFERENCE COUNT */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	2426
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2427 static PyObject *
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2428 load_module(PyObject name, FILE fp, PyObject pathname, int type, PyObject loader)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	2429 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2430 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2431
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2432 /* First check that there's an open file (if we need one) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2433 switch (type) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2434 case PY_SOURCE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2435 case PY_COMPILED:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2436 if (fp == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2437 PyErr_Format(PyExc_ValueError,
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2438 "file object required for import (type code %d)",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2439 type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2440 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2441 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2442 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2443
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2444 switch (type) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2445
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2446 case PY_SOURCE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2447 m = load_source_module(name, pathname, fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2448 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2449
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2450 case PY_COMPILED:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2451 m = load_compiled_module(name, pathname, fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2452 break;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2453
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2454 #ifdef HAVE_DYNAMIC_LOADING
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2455 case C_EXTENSION:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2456 m = _PyImport_LoadDynamicModule(name, pathname, fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2457 break;
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2458 #endif
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2459
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2460 case PKG_DIRECTORY:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2461 m = load_package(name, pathname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2462 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2463
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2464 case C_BUILTIN:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2465 case PY_FROZEN:
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2466 m = load_builtin(name, type);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2467 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2468
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2469 case IMP_HOOK: {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72866 diff changeset	2470 _Py_IDENTIFIER(load_module);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2471 if (loader == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2472 PyErr_SetString(PyExc_ImportError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2473 "import hook without loader");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2474 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2475 }
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72718 diff changeset	2476 m = _PyObject_CallMethodId(loader, &PyId_load_module, "O", name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2477 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2478 }
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 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2481 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	2482 "Don't know how to import %R (type code %d)",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2483 name, type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2484 m = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2485
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2486 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2487
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2488 return m;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2489 }
40 f28ac7f621c7 Added reload() functionality. Guido van Rossum <guido@python.org> parents: 6 diff changeset	2490
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	2491
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2492 /* 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	2493 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	2494 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	2495
bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	2496 static int
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2497 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	2498 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2499 struct _inittab *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2500
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2501 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	2502 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2503
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2504 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	2505 PyObject *mod;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2506 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	2507 if (p->initfunc == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2508 PyErr_Format(PyExc_ImportError,
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2509 "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	2510 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2511 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2512 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2513 if (Py_VerboseFlag)
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2514 PySys_FormatStderr("import %U # builtin\n", name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2515 mod = (*p->initfunc)();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2516 if (mod == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2517 return -1;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2518 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	2519 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2520 /* 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	2521 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	2522 Py_DECREF(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2523 return 1;
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 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2526 return 0;
141 bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	2527 }
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2528
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2529
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2530 /* 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	2531
3683 ec39264311ff struct frozen is now struct _frozen and comes from import.h. Guido van Rossum <guido@python.org> parents: 3590 diff changeset	2532 static struct _frozen *
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2533 find_frozen(PyObject *name)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2534 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2535 struct _frozen *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2536
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2537 if (name == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2538 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2539
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2540 for (p = PyImport_FrozenModules; ; p++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2541 if (p->name == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2542 return NULL;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2543 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	2544 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2545 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2546 return p;
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2547 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2548
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2549 static PyObject *
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2550 get_frozen_object(PyObject *name)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2551 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2552 struct _frozen *p = find_frozen(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2553 int size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2554
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2555 if (p == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2556 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2557 "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	2558 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2559 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2560 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2561 if (p->code == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2562 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2563 "Excluded frozen object named %R",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2564 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2565 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2566 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2567 size = p->size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2568 if (size < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2569 size = -size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2570 return PyMarshal_ReadObjectFromString((char *)p->code, size);
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2571 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2572
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2573 static PyObject *
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2574 is_frozen_package(PyObject *name)
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2575 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2576 struct _frozen *p = find_frozen(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2577 int size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2578
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2579 if (p == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2580 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2581 "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	2582 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2583 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2584 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2585
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2586 size = p->size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2587
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2588 if (size < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2589 Py_RETURN_TRUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2590 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2591 Py_RETURN_FALSE;
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2592 }
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2593
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2594
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2595 /* Initialize a frozen module.
52073 56983cfdf5d4 Fix a typo in a comment. Brett Cannon <bcannon@gmail.com> parents: 51996 diff changeset	2596 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	2597 an exception set if the initialization failed.
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2598 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	2599
6263e2fd9398 init_frozen non-static, frozenmain.c not in Makefile any more Guido van Rossum <guido@python.org> parents: 2270 diff changeset	2600 int
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2601 PyImport_ImportFrozenModuleObject(PyObject *name)
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2602 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2603 struct _frozen *p;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2604 PyObject co, m, *path;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2605 int ispackage;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2606 int size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2607
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2608 p = find_frozen(name);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2609
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2610 if (p == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2611 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2612 if (p->code == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2613 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2614 "Excluded frozen object named %R",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2615 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2616 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2617 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2618 size = p->size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2619 ispackage = (size < 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2620 if (ispackage)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2621 size = -size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2622 if (Py_VerboseFlag)
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2623 PySys_FormatStderr("import %U # frozen%s\n",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2624 name, ispackage ? " package" : "");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2625 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	2626 if (co == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2627 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2628 if (!PyCode_Check(co)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2629 PyErr_Format(PyExc_TypeError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2630 "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	2631 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2632 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2633 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2634 if (ispackage) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2635 /* Set __path__ to the package name */
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2636 PyObject d, l;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2637 int err;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2638 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2639 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2640 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2641 d = PyModule_GetDict(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2642 l = PyList_New(1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2643 if (l == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2644 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2645 }
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2646 Py_INCREF(name);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2647 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	2648 err = PyDict_SetItemString(d, "__path__", l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2649 Py_DECREF(l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2650 if (err != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2651 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2652 }
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2653 path = PyUnicode_FromString("<frozen>");
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2654 if (path == NULL)
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2655 goto err_return;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2656 m = PyImport_ExecCodeModuleObject(name, co, path, NULL);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2657 Py_DECREF(path);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2658 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2659 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2660 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2661 Py_DECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2662 return 1;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2663 err_return:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2664 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2665 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	2666 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2667
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2668 int
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2669 PyImport_ImportFrozenModule(char *name)
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2670 {
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2671 PyObject *nameobj;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2672 int ret;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2673 nameobj = PyUnicode_InternFromString(name);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2674 if (nameobj == NULL)
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2675 return -1;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2676 ret = PyImport_ImportFrozenModuleObject(nameobj);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2677 Py_DECREF(nameobj);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2678 return ret;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2679 }
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2680
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2681
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2682 /* 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	2683 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	2684
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2685 PyObject *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35757 diff changeset	2686 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	2687 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2688 PyObject *pname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2689 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2690
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2691 pname = PyUnicode_FromString(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2692 if (pname == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2693 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2694 result = PyImport_Import(pname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2695 Py_DECREF(pname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2696 return result;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2697 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2698
44441 b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2699 /* Import a module without blocking
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2700 *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2701 * 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	2702 * 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	2703 * 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	2704 * ImportError instead of blocking.
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2705 *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2706 * 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	2707 */
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2708 PyObject *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2709 PyImport_ImportModuleNoBlock(const char *name)
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2710 {
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2711 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	2712 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2713 long me;
72169 cd1978dbac08 Remove unused variable if Python is build without threads Victor Stinner <victor.stinner@haypocalc.com> parents: 68257 diff changeset	2714 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2715
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2716 /* 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	2717 modules = PyImport_GetModuleDict();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2718 if (modules == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2719 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2720
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2721 nameobj = PyUnicode_FromString(name);
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2722 if (nameobj == NULL)
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2723 return NULL;
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2724 result = PyDict_GetItem(modules, nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2725 if (result != NULL) {
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2726 Py_DECREF(nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2727 Py_INCREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2728 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2729 }
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2730 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	2731 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2732 /* check the import lock
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2733 * 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	2734 * takes care of the problem */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2735 me = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2736 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	2737 /* 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	2738 result = PyImport_Import(nameobj);
61467 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 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2741 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	2742 "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	2743 "is held by another thread.",
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2744 nameobj);
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2745 result = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2746 }
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	2747 #else
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2748 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	2749 #endif
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2750 Py_DECREF(nameobj);
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2751 return result;
44441 b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2752 }
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2753
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2754 /* Forward declarations for helper routines */
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	2755 static PyObject get_parent(PyObject globals,
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2756 PyObject **p_name,
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2757 int level);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	2758 static PyObject load_next(PyObject mod, PyObject *altmod,
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	2759 PyObject inputname, PyObject *p_outputname,
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2760 PyObject **p_prefix);
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	2761 static int mark_miss(PyObject *name);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	2762 static int ensure_fromlist(PyObject mod, PyObject fromlist,
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	2763 PyObject *buf, int recursive);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2764 static PyObject * import_submodule(PyObject mod, PyObject name,
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2765 PyObject *fullname);
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2766
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2767 /* The Magnum Opus of dotted-name import :-) */
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2768
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	2769 static PyObject *
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	2770 import_module_level(PyObject name, PyObject globals, PyObject *locals,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2771 PyObject *fromlist, int level)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2772 {
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2773 PyObject parent, next, inputname, outputname;
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2774 PyObject *head = NULL;
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2775 PyObject *tail = NULL;
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2776 PyObject *prefix = NULL;
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2777 PyObject *result = NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2778 Py_ssize_t sep, altsep;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2779
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2780 if (PyUnicode_READY(name))
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2781 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2782
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2783 sep = PyUnicode_FindChar(name, SEP, 0, PyUnicode_GET_LENGTH(name), 1);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2784 if (sep == -2)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2785 return NULL;
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	2786 #ifdef ALTSEP
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2787 altsep = PyUnicode_FindChar(name, ALTSEP, 0, PyUnicode_GET_LENGTH(name), 1);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2788 if (altsep == -2)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2789 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2790 #else
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2791 altsep = -1;
44617 a29adc3b0f26 Merged revisions 59864-59882 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	2792 #endif
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2793 if (sep != -1 \|\| altsep != -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2794 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2795 PyErr_SetString(PyExc_ImportError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2796 "Import by filename is not supported.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2797 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2798 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2799
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2800 parent = get_parent(globals, &prefix, level);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2801 if (parent == NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2802 return NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2803 }
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2804
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2805 if (PyUnicode_READY(prefix))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2806 return NULL;
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	2807
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2808 head = load_next(parent, level < 0 ? Py_None : parent, name, &outputname,
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2809 &prefix);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2810 if (head == NULL)
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2811 goto out;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2812
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2813 tail = head;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2814 Py_INCREF(tail);
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	2815
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2816 if (outputname != NULL) {
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2817 while (1) {
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2818 inputname = outputname;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2819 next = load_next(tail, tail, inputname, &outputname,
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2820 &prefix);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2821 Py_CLEAR(tail);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2822 Py_CLEAR(inputname);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2823 if (next == NULL)
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2824 goto out;
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	2825 tail = next;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2826
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2827 if (outputname == NULL) {
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2828 break;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2829 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2830 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2831 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2832 if (tail == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2833 /* If tail is Py_None, both get_parent and load_next found
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2834 an empty module name: someone called __import__("") or
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2835 doctored faulty bytecode */
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	2836 PyErr_SetString(PyExc_ValueError, "Empty module name");
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2837 goto out;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2838 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2839
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2840 if (fromlist != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2841 if (fromlist == Py_None \|\| !PyObject_IsTrue(fromlist))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2842 fromlist = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2843 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2844
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2845 if (fromlist == NULL) {
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2846 result = head;
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2847 Py_INCREF(result);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2848 goto out;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2849 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2850
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2851 if (!ensure_fromlist(tail, fromlist, prefix, 0))
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2852 goto out;
73592 a16d2a8a07cc Catch PyUnicode_AS_UNICODE() errors Victor Stinner <victor.stinner@haypocalc.com> parents: 73577 diff changeset	2853
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2854 result = tail;
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2855 Py_INCREF(result);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2856 out:
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2857 Py_XDECREF(head);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2858 Py_XDECREF(tail);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2859 Py_XDECREF(prefix);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	2860 return result;
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2861 }
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2862
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2863 PyObject *
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2864 PyImport_ImportModuleLevelObject(PyObject name, PyObject globals,
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2865 PyObject locals, PyObject fromlist,
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2866 int level)
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2867 {
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2868 PyObject *mod;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2869 _PyImport_AcquireLock();
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2870 mod = import_module_level(name, globals, locals, fromlist, level);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2871 if (_PyImport_ReleaseLock() < 0) {
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2872 Py_XDECREF(mod);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2873 PyErr_SetString(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2874 "not holding the import lock");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2875 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2876 }
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2877 return 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	2878 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	2879
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2880 PyObject *
70374 a9126e8770e5 make PyImport_ImportModuleLevel's first arg const like similiar functions (closes #12173) Benjamin Peterson <benjamin@python.org> parents: 69463 diff changeset	2881 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	2882 PyObject *fromlist, int level)
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2883 {
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2884 PyObject nameobj, mod;
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2885 nameobj = PyUnicode_FromString(name);
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2886 if (nameobj == NULL)
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2887 return NULL;
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2888 mod = PyImport_ImportModuleLevelObject(nameobj, globals, locals,
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2889 fromlist, level);
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2890 Py_DECREF(nameobj);
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2891 return mod;
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2892 }
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2893
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2894
32156 56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2895 /* Return the package that an import is being performed in. If globals comes
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2896 from the module foo.bar.bat (not itself a package), this returns the
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2897 sys.modules entry for foo.bar. If globals is from a package's __init__.py,
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2898 the package's entry in sys.modules is returned, as a borrowed reference.
32156 56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2899
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	2900 The name of the returned package is returned in *p_name.
32156 56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2901
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2902 If globals doesn't come from a package or a module in a package, or a
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2903 corresponding entry is not found in sys.modules, Py_None is returned.
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2904 */
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2905 static PyObject *
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	2906 get_parent(PyObject globals, PyObject *p_name, int level)
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2907 {
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	2908 PyObject *nameobj;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2909
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2910 static PyObject *namestr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2911 static PyObject *pathstr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2912 static PyObject *pkgstr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2913 PyObject pkgname, modname, modpath, modules, *parent;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2914 int orig_level = level;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2915
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2916 if (globals == NULL \|\| !PyDict_Check(globals) \|\| !level)
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	2917 goto return_none;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2918
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2919 if (namestr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2920 namestr = PyUnicode_InternFromString("__name__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2921 if (namestr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2922 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2923 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2924 if (pathstr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2925 pathstr = PyUnicode_InternFromString("__path__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2926 if (pathstr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2927 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2928 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2929 if (pkgstr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2930 pkgstr = PyUnicode_InternFromString("__package__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2931 if (pkgstr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2932 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2933 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2934
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2935 pkgname = PyDict_GetItem(globals, pkgstr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2936
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2937 if ((pkgname != NULL) && (pkgname != Py_None)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2938 /* __package__ is set, so use it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2939 if (!PyUnicode_Check(pkgname)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2940 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2941 "__package__ set to non-string");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2942 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2943 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2944 if (PyUnicode_GET_LENGTH(pkgname) == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2945 if (level > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2946 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2947 "Attempted relative import in non-package");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2948 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2949 }
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	2950 goto return_none;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2951 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2952 Py_INCREF(pkgname);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2953 nameobj = pkgname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2954 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2955 /* __package__ not set, so figure it out and set it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2956 modname = PyDict_GetItem(globals, namestr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2957 if (modname == NULL \|\| !PyUnicode_Check(modname))
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	2958 goto return_none;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2959
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2960 modpath = PyDict_GetItem(globals, pathstr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2961 if (modpath != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2962 /* __path__ is set, so modname is already the package name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2963 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2964
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2965 error = PyDict_SetItem(globals, pkgstr, modname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2966 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2967 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2968 "Could not set __package__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2969 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2970 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2971 Py_INCREF(modname);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2972 nameobj = modname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2973 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2974 /* Normal module, so work out the package name if any */
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	2975 Py_ssize_t len;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2976 len = PyUnicode_FindChar(modname, '.',
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2977 0, PyUnicode_GET_LENGTH(modname), -1);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2978 if (len == -2)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2979 return NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2980 if (len < 0) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2981 if (level > 0) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2982 PyErr_SetString(PyExc_ValueError,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2983 "Attempted relative import in non-package");
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2984 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2985 }
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2986 if (PyDict_SetItem(globals, pkgstr, Py_None)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2987 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2988 "Could not set __package__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2989 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2990 }
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	2991 goto return_none;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2992 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2993 pkgname = PyUnicode_Substring(modname, 0, len);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2994 if (pkgname == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2995 return NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2996 if (PyDict_SetItem(globals, pkgstr, pkgname)) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	2997 Py_DECREF(pkgname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2998 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2999 "Could not set __package__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3000 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3001 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3002 nameobj = pkgname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3003 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3004 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3005 if (level > 1) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3006 Py_ssize_t dot, end = PyUnicode_GET_LENGTH(nameobj);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3007 PyObject *newname;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3008 while (--level > 0) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3009 dot = PyUnicode_FindChar(nameobj, '.', 0, end, -1);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3010 if (dot == -2) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3011 Py_DECREF(nameobj);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3012 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3013 }
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3014 if (dot < 0) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3015 Py_DECREF(nameobj);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3016 PyErr_SetString(PyExc_ValueError,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3017 "Attempted relative import beyond "
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3018 "toplevel package");
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3019 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3020 }
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3021 end = dot;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3022 }
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3023 newname = PyUnicode_Substring(nameobj, 0, end);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3024 Py_DECREF(nameobj);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3025 if (newname == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3026 return NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3027 nameobj = newname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3028 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3029
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3030 modules = PyImport_GetModuleDict();
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	3031 parent = PyDict_GetItem(modules, nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3032 if (parent == NULL) {
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	3033 int err;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3034
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3035 if (orig_level >= 1) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3036 PyErr_Format(PyExc_SystemError,
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	3037 "Parent module %R not loaded, "
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3038 "cannot perform relative import", nameobj);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3039 Py_DECREF(nameobj);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3040 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3041 }
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	3042
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3043 err = PyErr_WarnFormat(
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3044 PyExc_RuntimeWarning, 1,
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3045 "Parent module %R not found while handling absolute import",
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3046 nameobj);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3047 Py_DECREF(nameobj);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3048 if (err)
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3049 return NULL;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3050
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3051 goto return_none;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3052 }
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	3053 *p_name = nameobj;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3054 return parent;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3055 /* We expect, but can't guarantee, if parent != None, that:
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	3056 - parent.__name__ == name
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3057 - parent.__dict__ is globals
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3058 If this is violated... Who cares? */
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	3059
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3060 return_none:
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3061 nameobj = PyUnicode_New(0, 0);
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	3062 if (nameobj == NULL)
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3063 return NULL;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3064 *p_name = nameobj;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3065 return Py_None;
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	3066 }
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	3067
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3068 /* altmod is either None or same as mod */
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	3069 static PyObject *
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	3070 load_next(PyObject mod, PyObject altmod,
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3071 PyObject inputname, PyObject *p_outputname,
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3072 PyObject **p_prefix)
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	3073 {
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3074 Py_ssize_t dot;
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	3075 Py_ssize_t len;
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3076 PyObject fullname, name = NULL, *result;
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	3077
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3078 *p_outputname = NULL;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3079
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3080 len = PyUnicode_GET_LENGTH(inputname);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3081 if (len == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3082 /* completely empty module name should only happen in
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3083 'from . import' (or '__import__("")')*/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3084 Py_INCREF(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3085 return mod;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3086 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3087
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3088
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3089 dot = PyUnicode_FindChar(inputname, '.', 0, len, 1);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3090 if (dot >= 0) {
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3091 len = dot;
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	3092 if (len == 0) {
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3093 PyErr_SetString(PyExc_ValueError,
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3094 "Empty module name");
72563 1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	3095 goto error;
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	3096 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3097 }
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3098
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3099 /* name = inputname[:len] */
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3100 name = PyUnicode_Substring(inputname, 0, len);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3101 if (name == NULL)
72563 1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	3102 goto error;
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3103
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3104 if (PyUnicode_GET_LENGTH(*p_prefix)) {
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3105 /* fullname = prefix + "." + name */
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3106 fullname = PyUnicode_FromFormat("%U.%U", *p_prefix, name);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3107 if (fullname == NULL)
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3108 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3109 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3110 else {
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3111 fullname = name;
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3112 Py_INCREF(fullname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3113 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3114
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	3115 result = import_submodule(mod, name, fullname);
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3116 Py_DECREF(*p_prefix);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3117 /* Transfer reference. */
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3118 *p_prefix = fullname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3119 if (result == Py_None && altmod != mod) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3120 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3121 /* Here, altmod must be None and mod must not be None */
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	3122 result = import_submodule(altmod, name, name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3123 if (result != NULL && result != Py_None) {
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3124 if (mark_miss(*p_prefix) != 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3125 Py_DECREF(result);
72563 1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	3126 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3127 }
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3128 Py_DECREF(*p_prefix);
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3129 *p_prefix = name;
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3130 Py_INCREF(*p_prefix);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3131 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3132 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3133 if (result == NULL)
72563 1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	3134 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3135
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3136 if (result == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3137 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3138 PyErr_Format(PyExc_ImportError,
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	3139 "No module named %R", inputname);
72563 1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	3140 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3141 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3142
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3143 if (dot >= 0) {
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3144 *p_outputname = PyUnicode_Substring(inputname, dot+1,
941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3145 PyUnicode_GET_LENGTH(inputname));
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	3146 if (*p_outputname == NULL) {
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3147 Py_DECREF(result);
72563 1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	3148 goto error;
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	3149 }
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3150 }
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3151
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3152 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3153 return result;
72563 1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	3154
1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	3155 error:
73227 941c67762fd8 Port import_module_level to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73206 diff changeset	3156 Py_XDECREF(name);
72563 1b203e741fb2 Issue 13085: Fix some memory leaks. Patch by Stefan Krah. Martin v. Löwis <martin@v.loewis.de> parents: 72489 diff changeset	3157 return NULL;
6252 6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	3158 }
6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	3159
6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	3160 static int
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	3161 mark_miss(PyObject *name)
6252 6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	3162 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3163 PyObject *modules = PyImport_GetModuleDict();
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	3164 return PyDict_SetItem(modules, name, Py_None);
6252 6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	3165 }
6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	3166
6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	3167 static int
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	3168 ensure_fromlist(PyObject mod, PyObject fromlist, PyObject *name,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3169 int recursive)
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	3170 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3171 int i;
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	3172 PyObject *fullname;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3173 Py_ssize_t fromlist_len;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3174
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	3175 if (!_PyObject_HasAttrId(mod, &PyId___path__))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3176 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3177
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	3178 fromlist_len = PySequence_Size(fromlist);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3179
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3180 for (i = 0; i < fromlist_len; i++) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3181 PyObject *item = PySequence_GetItem(fromlist, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3182 int hasit;
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	3183 if (item == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3184 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3185 if (!PyUnicode_Check(item)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3186 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3187 "Item in ``from list'' not a string");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3188 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3189 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3190 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3191 if (PyUnicode_READ_CHAR(item, 0) == '*') {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3192 PyObject *all;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72866 diff changeset	3193 _Py_IDENTIFIER(__all__);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3194 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3195 /* See if the package defines __all__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3196 if (recursive)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3197 continue; /* Avoid endless recursion */
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	3198 all = _PyObject_GetAttrId(mod, &PyId___all__);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3199 if (all == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3200 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3201 else {
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	3202 int ret = ensure_fromlist(mod, all, name, 1);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3203 Py_DECREF(all);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3204 if (!ret)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3205 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3206 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3207 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3208 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3209 hasit = PyObject_HasAttr(mod, item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3210 if (!hasit) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3211 PyObject *submod;
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	3212 fullname = PyUnicode_FromFormat("%U.%U", name, item);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3213 if (fullname != NULL) {
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3214 submod = import_submodule(mod, item, fullname);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3215 Py_DECREF(fullname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3216 }
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	3217 else
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3218 submod = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3219 Py_XDECREF(submod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3220 if (submod == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3221 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3222 return 0;
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 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3225 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3226 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3227
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	3228 return 1;
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	3229 }
f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	3230
29501 6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	3231 static int
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	3232 add_submodule(PyObject mod, PyObject submod, PyObject *fullname,
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3233 PyObject subname, PyObject modules)
29501 6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	3234 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3235 if (mod == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3236 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3237 /* Irrespective of the success of this load, make a
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3238 reference to it in the parent package module. A copy gets
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3239 saved in the modules dictionary under the full name, so get a
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3240 reference from there, if need be. (The exception is when the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3241 load failed with a SyntaxError -- then there's no trace in
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3242 sys.modules. In that case, of course, do nothing extra.) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3243 if (submod == NULL) {
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	3244 submod = PyDict_GetItem(modules, fullname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3245 if (submod == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3246 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3247 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3248 if (PyModule_Check(mod)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3249 /* We can't use setattr here since it can give a
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3250 * spurious warning if the submodule name shadows a
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3251 * builtin name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3252 PyObject *dict = PyModule_GetDict(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3253 if (!dict)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3254 return 0;
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	3255 if (PyDict_SetItem(dict, subname, submod) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3256 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3257 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3258 else {
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	3259 if (PyObject_SetAttr(mod, subname, submod) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3260 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3261 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3262 return 1;
29501 6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	3263 }
6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	3264
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	3265 static PyObject *
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	3266 import_submodule(PyObject mod, PyObject subname, PyObject *fullname)
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	3267 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3268 PyObject *modules = PyImport_GetModuleDict();
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3269 PyObject m = NULL, bufobj, path_list, loader;
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3270 struct filedescr *fdp;
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3271 FILE *fp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3272
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3273 /* Require:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3274 if mod == None: subname == fullname
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3275 else: mod.__name__ + "." + subname == fullname
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3276 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3277
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	3278 if ((m = PyDict_GetItem(modules, fullname)) != NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3279 Py_INCREF(m);
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3280 return m;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3281 }
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3282
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3283 if (mod == Py_None)
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3284 path_list = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3285 else {
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	3286 path_list = _PyObject_GetAttrId(mod, &PyId___path__);
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3287 if (path_list == NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3288 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3289 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3290 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3291 }
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3292 }
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3293
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3294 fdp = find_module(fullname, subname, path_list,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3295 &bufobj, &fp, &loader);
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3296 Py_XDECREF(path_list);
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3297 if (fdp == NULL) {
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3298 if (!PyErr_ExceptionMatches(PyExc_ImportError))
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3299 return NULL;
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3300 PyErr_Clear();
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3301 Py_INCREF(Py_None);
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3302 return Py_None;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3303 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3304 m = load_module(fullname, fp, bufobj, fdp->type, loader);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3305 Py_XDECREF(bufobj);
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3306 Py_XDECREF(loader);
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3307 if (fp)
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3308 fclose(fp);
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3309 if (m == NULL)
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3310 return NULL;
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3311 if (!add_submodule(mod, m, fullname, subname, modules)) {
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3312 Py_XDECREF(m);
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3313 return NULL;
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3314 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3315 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	3316 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3317
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3318
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3319 /* 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	3320 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	3321
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3322 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3323 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	3324 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3325 PyInterpreterState *interp = PyThreadState_Get()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3326 PyObject *modules_reloading = interp->modules_reloading;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3327 PyObject *modules = PyImport_GetModuleDict();
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3328 PyObject path_list = NULL, loader = NULL, *existing_m = NULL;
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3329 PyObject name, bufobj, *subname;
a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3330 Py_ssize_t subname_start;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3331 struct filedescr *fdp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3332 FILE *fp = NULL;
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3333 PyObject *newm = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3334
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3335 if (modules_reloading == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3336 Py_FatalError("PyImport_ReloadModule: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3337 "no modules_reloading dictionary!");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3338 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3339 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3340
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3341 if (m == NULL \|\| !PyModule_Check(m)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3342 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3343 "reload() argument must be module");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3344 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3345 }
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3346 name = PyModule_GetNameObject(m);
a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3347 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	3348 return NULL;
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3349 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	3350 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	3351 "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	3352 name);
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3353 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3354 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3355 }
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3356 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	3357 if (existing_m != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3358 /* 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	3359 being reloaded. */
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3360 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3361 Py_INCREF(existing_m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3362 return existing_m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3363 }
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3364 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	3365 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3366 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	3367 }
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3368
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3369 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	3370 PyUnicode_GET_LENGTH(name), -1);
a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3371 if (subname_start == -1) {
a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3372 Py_INCREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3373 subname = name;
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3374 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3375 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3376 PyObject parentname, parent;
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3377 Py_ssize_t len;
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3378 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	3379 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	3380 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3381 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3382 parent = PyDict_GetItem(modules, parentname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3383 if (parent == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3384 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	3385 "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	3386 parentname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3387 Py_DECREF(parentname);
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3388 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3389 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3390 Py_DECREF(parentname);
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	3391 path_list = _PyObject_GetAttrId(parent, &PyId___path__);
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3392 if (path_list == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3393 PyErr_Clear();
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3394 subname_start++;
a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3395 len = PyUnicode_GET_LENGTH(name) - (subname_start + 1);
a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3396 subname = PyUnicode_Substring(name, subname_start, len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3397 }
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3398 if (subname == NULL)
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3399 goto error;
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3400 fdp = find_module(name, subname, path_list,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3401 &bufobj, &fp, &loader);
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3402 Py_DECREF(subname);
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3403 Py_XDECREF(path_list);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3404
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3405 if (fdp == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3406 Py_XDECREF(loader);
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3407 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3408 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3409
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3410 newm = load_module(name, fp, bufobj, fdp->type, loader);
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3411 Py_XDECREF(bufobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3412 Py_XDECREF(loader);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3413
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3414 if (fp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3415 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3416 if (newm == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3417 /* 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	3418 * 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	3419 * 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	3420 * 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	3421 */
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3422 PyDict_SetItem(modules, name, m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3423 }
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3424
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3425 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3426 imp_modules_reloading_clear();
73198 a938d0258abe Port PyImport_ReloadModule to Unicode API. Martin v. Löwis <martin@v.loewis.de> parents: 73110 diff changeset	3427 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3428 return newm;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3429 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3430
d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3431
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3432 /* 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	3433 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	3434 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	3435 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	3436 environment.
9680 8b61e1273b4b Improve comment for PyImport_Import() as suggested by Bill Tutt. Guido van Rossum <guido@python.org> parents: 9679 diff changeset	3437 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	3438 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	3439 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	3440
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3441 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3442 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	3443 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3444 static PyObject *silly_list = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3445 static PyObject *builtins_str = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3446 static PyObject *import_str = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3447 PyObject *globals = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3448 PyObject *import = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3449 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	3450 PyObject *modules = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3451 PyObject *r = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3452
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3453 /* Initialize constant string objects */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3454 if (silly_list == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3455 import_str = PyUnicode_InternFromString("__import__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3456 if (import_str == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3457 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3458 builtins_str = PyUnicode_InternFromString("__builtins__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3459 if (builtins_str == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3460 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	3461 silly_list = PyList_New(0);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3462 if (silly_list == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3463 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3464 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3465
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3466 /* Get the builtins from current globals */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3467 globals = PyEval_GetGlobals();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3468 if (globals != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3469 Py_INCREF(globals);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3470 builtins = PyObject_GetItem(globals, builtins_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3471 if (builtins == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3472 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3473 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3474 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3475 /* 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	3476 builtins = PyImport_ImportModuleLevel("builtins",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3477 NULL, NULL, NULL, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3478 if (builtins == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3479 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3480 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	3481 if (globals == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3482 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3483 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3484
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3485 /* 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	3486 if (PyDict_Check(builtins)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3487 import = PyObject_GetItem(builtins, import_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3488 if (import == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3489 PyErr_SetObject(PyExc_KeyError, import_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3490 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3491 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3492 import = PyObject_GetAttr(builtins, import_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3493 if (import == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3494 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3495
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3496 /* 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	3497 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	3498 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	3499 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	3500 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	3501 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	3502 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	3503 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	3504
dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	3505 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	3506 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	3507 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	3508 Py_INCREF(r);
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3509
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3510 err:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3511 Py_XDECREF(globals);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3512 Py_XDECREF(builtins);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3513 Py_XDECREF(import);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3514
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3515 return r;
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3516 }
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3517
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3518
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3519 /* 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	3520 importing modules.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3521 */
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3522
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3523 static PyObject *
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3524 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	3525 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3526 char buf[4];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3527
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3528 buf[0] = (char) ((magic >> 0) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3529 buf[1] = (char) ((magic >> 8) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3530 buf[2] = (char) ((magic >> 16) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3531 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	3532
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3533 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	3534 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3535
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3536 static PyObject *
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3537 imp_get_magic(PyObject self, PyObject noargs)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3538 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3539 return imp_make_magic(pyc_magic);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3540 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3541
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3542 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3543 imp_get_tag(PyObject self, PyObject noargs)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3544 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3545 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	3546 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3547
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3548 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	3549 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	3550 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3551 PyObject *list;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3552 struct filedescr *fdp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3553
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3554 list = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3555 if (list == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3556 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3557 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	3558 PyObject *item = Py_BuildValue("ssi",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3559 fdp->suffix, fdp->mode, fdp->type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3560 if (item == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3561 Py_DECREF(list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3562 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3563 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3564 if (PyList_Append(list, item) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3565 Py_DECREF(list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3566 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3567 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3568 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3569 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3570 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3571 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	3572 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3573
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3574 static PyObject *
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3575 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	3576 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3577 extern int fclose(FILE *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3578 PyObject fob, ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3579 PyObject *pathobj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3580 struct filedescr *fdp;
68717 d52f471fbbeb Issue #3080: find_module() initialize buf and p_fp Victor Stinner <victor.stinner@haypocalc.com>* parents: 68716 diff changeset	3581 FILE *fp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3582 int fd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3583 char *found_encoding = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3584 char *encoding = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3585
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3586 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	3587 path_list = NULL;
fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3588 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	3589 &pathobj, &fp, NULL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3590 if (fdp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3591 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3592 if (fp != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3593 fd = fileno(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3594 if (fd != -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3595 fd = dup(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3596 fclose(fp);
70901 b4a7cd376d6f call_find_module() handles dup() failure: raise an OSError exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70900 diff changeset	3597 if (fd == -1) {
b4a7cd376d6f call_find_module() handles dup() failure: raise an OSError exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70900 diff changeset	3598 PyErr_SetFromErrno(PyExc_OSError);
b4a7cd376d6f call_find_module() handles dup() failure: raise an OSError exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70900 diff changeset	3599 return NULL;
b4a7cd376d6f call_find_module() handles dup() failure: raise an OSError exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70900 diff changeset	3600 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3601 fp = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3602 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3603 if (fd != -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3604 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	3605 /* 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	3606 memory. */
69148 7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	3607 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	3608 lseek(fd, 0, 0); /* Reset position */
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3609 if (found_encoding == NULL && PyErr_Occurred()) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3610 Py_XDECREF(pathobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3611 return NULL;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3612 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3613 encoding = (found_encoding != NULL) ? found_encoding :
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3614 (char*)PyUnicode_GetDefaultEncoding();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3615 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3616 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	3617 (char*)encoding, NULL, NULL, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3618 if (fob == NULL) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3619 Py_XDECREF(pathobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3620 close(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3621 PyMem_FREE(found_encoding);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3622 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3623 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3624 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3625 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3626 fob = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3627 Py_INCREF(fob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3628 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3629 if (pathobj == NULL) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3630 Py_INCREF(Py_None);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3631 pathobj = Py_None;
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3632 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3633 ret = Py_BuildValue("NN(ssi)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3634 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	3635 PyMem_FREE(found_encoding);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3636
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3637 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3638 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3639
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3640 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3641 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	3642 {
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3643 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	3644 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	3645 &name, &path_list))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3646 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	3647 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	3648 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3649
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3650 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3651 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	3652 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	3653 PyObject *name;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3654 int ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3655 PyObject *m;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	3656 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	3657 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3658 ret = init_builtin(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3659 if (ret < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3660 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3661 if (ret == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3662 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3663 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3664 }
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	3665 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3666 Py_XINCREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3667 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	3668 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3669
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3670 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3671 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	3672 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3673 PyObject *name;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3674 int ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3675 PyObject *m;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3676 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	3677 return NULL;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3678 ret = PyImport_ImportFrozenModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3679 if (ret < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3680 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3681 if (ret == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3682 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3683 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3684 }
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3685 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3686 Py_XINCREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3687 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	3688 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3689
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3690 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3691 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	3692 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3693 PyObject *name;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3694
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3695 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	3696 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3697 return get_frozen_object(name);
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	3698 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	3699
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3700 static PyObject *
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3701 imp_is_frozen_package(PyObject self, PyObject args)
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3702 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3703 PyObject *name;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3704
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3705 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	3706 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3707 return is_frozen_package(name);
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3708 }
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3709
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3710 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3711 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	3712 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	3713 PyObject *name;
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	3714 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	3715 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3716 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	3717 }
d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3718
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3719 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3720 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	3721 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3722 PyObject *name;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3723 struct _frozen *p;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3724 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	3725 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3726 p = find_frozen(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3727 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	3728 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3729
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3730 static FILE *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3731 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	3732 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3733 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3734 if (mode[0] == 'U')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3735 mode = "r" PY_STDIOTEXTMODE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3736 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	3737 fp = _Py_fopen(pathname, mode);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3738 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3739 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3740 int fd = PyObject_AsFileDescriptor(fob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3741 if (fd == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3742 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3743 if (!_PyVerify_fd(fd))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3744 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3745 /* 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	3746 * independently of the file descriptor given
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3747 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3748 fd = dup(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3749 if (fd == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3750 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3751 fp = fdopen(fd, mode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3752 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3753 if (fp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3754 return fp;
52545 2d80c2797501 get_file() no longer leaks a FILE structure. If given a file descriptor, it calls dup() to get a new handle. Then both the FILE object and the fd can be closed. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 52480 diff changeset	3755 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3756 PyErr_SetFromErrno(PyExc_IOError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3757 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	3758 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3759
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3760 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3761 imp_load_compiled(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3762 {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3763 PyObject name, pathname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3764 PyObject *fob = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3765 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3766 FILE *fp;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3767 if (!PyArg_ParseTuple(args, "UO&\|O:load_compiled",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3768 &name,
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3769 PyUnicode_FSDecoder, &pathname,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3770 &fob))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3771 return NULL;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3772 fp = get_file(pathname, fob, "rb");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3773 if (fp == NULL) {
66650 523a6fc53a70 import: use PyUnicode_FSConverter to support bytes path and PEP 383 Victor Stinner <victor.stinner@haypocalc.com> parents: 66599 diff changeset	3774 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3775 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3776 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3777 m = load_compiled_module(name, pathname, fp);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3778 fclose(fp);
66650 523a6fc53a70 import: use PyUnicode_FSConverter to support bytes path and PEP 383 Victor Stinner <victor.stinner@haypocalc.com> parents: 66599 diff changeset	3779 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3780 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	3781 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3782
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3783 #ifdef HAVE_DYNAMIC_LOADING
528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3784
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3785 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3786 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	3787 {
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3788 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	3789 FILE *fp;
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3790
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3791 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	3792 &name, PyUnicode_FSDecoder, &pathname, &fob))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3793 return NULL;
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3794 if (fob != NULL) {
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3795 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	3796 if (fp == NULL) {
68826 3114f26d5d54 Issue #11630, issue #3080: Fix refleak introduced by ef2b6305d395 Victor Stinner <victor.stinner@haypocalc.com> parents: 68823 diff changeset	3797 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3798 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3799 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3800 }
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3801 else
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3802 fp = NULL;
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3803 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	3804 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3805 if (fp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3806 fclose(fp);
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3807 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	3808 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3809
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3810 #endif /* HAVE_DYNAMIC_LOADING */
528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3811
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3812 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3813 imp_load_source(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3814 {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3815 PyObject name, pathname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3816 PyObject *fob = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3817 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3818 FILE *fp;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3819 if (!PyArg_ParseTuple(args, "UO&\|O:load_source",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3820 &name,
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3821 PyUnicode_FSDecoder, &pathname,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3822 &fob))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3823 return NULL;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3824 fp = get_file(pathname, fob, "r");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3825 if (fp == NULL) {
66650 523a6fc53a70 import: use PyUnicode_FSConverter to support bytes path and PEP 383 Victor Stinner <victor.stinner@haypocalc.com> parents: 66599 diff changeset	3826 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3827 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3828 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3829 m = load_source_module(name, pathname, fp);
66650 523a6fc53a70 import: use PyUnicode_FSConverter to support bytes path and PEP 383 Victor Stinner <victor.stinner@haypocalc.com> parents: 66599 diff changeset	3830 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3831 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3832 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	3833 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3834
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3835 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3836 imp_load_module(PyObject self, PyObject args)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3837 {
68768 7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3838 PyObject name, fob, pathname, pathname_obj, *ret;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3839 char suffix; / Unused */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3840 char *mode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3841 int type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3842 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3843
68768 7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3844 if (!PyArg_ParseTuple(args, "UOO(ssi):load_module",
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3845 &name, &fob, &pathname_obj, &suffix, &mode, &type))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3846 return NULL;
68768 7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3847 if (pathname_obj != Py_None) {
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3848 if (!PyUnicode_FSDecoder(pathname_obj, &pathname))
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3849 return NULL;
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3850 }
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3851 else
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3852 pathname = NULL;
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3853
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3854 if (*mode) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3855 /* Mode must start with 'r' or 'U' and must not contain '+'.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3856 Implicit in this test is the assumption that the mode
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3857 may contain other modifiers like 'b' or 't'. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3858
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3859 if (!(mode == 'r' \|\| mode == 'U') \|\| strchr(mode, '+')) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3860 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3861 "invalid file open mode %.200s", mode);
68768 7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3862 Py_XDECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3863 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3864 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3865 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3866 if (fob == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3867 fp = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3868 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3869 fp = get_file(NULL, fob, mode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3870 if (fp == NULL) {
68768 7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3871 Py_XDECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3872 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3873 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3874 }
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	3875 ret = load_module(name, fp, pathname, type, NULL);
68768 7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3876 Py_XDECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3877 if (fp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3878 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3879 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3880 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3881
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3882 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3883 imp_load_package(PyObject self, PyObject args)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3884 {
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3885 PyObject name, pathname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3886 PyObject * ret;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3887 if (!PyArg_ParseTuple(args, "UO&:load_package",
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3888 &name, PyUnicode_FSDecoder, &pathname))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3889 return NULL;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3890 ret = load_package(name, pathname);
66650 523a6fc53a70 import: use PyUnicode_FSConverter to support bytes path and PEP 383 Victor Stinner <victor.stinner@haypocalc.com> parents: 66599 diff changeset	3891 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3892 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3893 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3894
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3895 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3896 imp_new_module(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3897 {
68736 c17bc2026145 Issue #3080: imp.new_module() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68735 diff changeset	3898 PyObject *name;
c17bc2026145 Issue #3080: imp.new_module() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68735 diff changeset	3899 if (!PyArg_ParseTuple(args, "U:new_module", &name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3900 return NULL;
68736 c17bc2026145 Issue #3080: imp.new_module() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68735 diff changeset	3901 return PyModule_NewObject(name);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3902 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3903
44567 cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3904 static PyObject *
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3905 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	3906 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3907 return PyImport_ReloadModule(v);
44567 cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3908 }
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3909
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3910 PyDoc_STRVAR(doc_reload,
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3911 "reload(module) -> module\n\
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3912 \n\
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3913 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	3914
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3915 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3916 imp_cache_from_source(PyObject self, PyObject args, PyObject *kws)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3917 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3918 static char *kwlist[] = {"path", "debug_override", NULL};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3919
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3920 PyObject pathname, cpathname;
65391 f98c3e2fd055 fix refleak Benjamin Peterson <benjamin@python.org> parents: 65383 diff changeset	3921 PyObject *debug_override = NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3922 int debug = !Py_OptimizeFlag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3923
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3924 if (!PyArg_ParseTupleAndKeywords(
65380 844ed6dddc03 imp.cache_from_source() uses PyUnicode_FSConverter() to support surrogates in Victor Stinner <victor.stinner@haypocalc.com> parents: 65349 diff changeset	3925 args, kws, "O&\|O", kwlist,
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3926 PyUnicode_FSDecoder, &pathname, &debug_override))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3927 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3928
65391 f98c3e2fd055 fix refleak Benjamin Peterson <benjamin@python.org> parents: 65383 diff changeset	3929 if (debug_override != NULL &&
f98c3e2fd055 fix refleak Benjamin Peterson <benjamin@python.org> parents: 65383 diff changeset	3930 (debug = PyObject_IsTrue(debug_override)) < 0) {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3931 Py_DECREF(pathname);
65391 f98c3e2fd055 fix refleak Benjamin Peterson <benjamin@python.org> parents: 65383 diff changeset	3932 return NULL;
f98c3e2fd055 fix refleak Benjamin Peterson <benjamin@python.org> parents: 65383 diff changeset	3933 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3934
73064 fdb0ccf1f4b3 Add ready checks for make_compiled_pathname. Martin v. Löwis <martin@v.loewis.de> parents: 73063 diff changeset	3935 if (PyUnicode_READY(pathname) < 0)
fdb0ccf1f4b3 Add ready checks for make_compiled_pathname. Martin v. Löwis <martin@v.loewis.de> parents: 73063 diff changeset	3936 return NULL;
fdb0ccf1f4b3 Add ready checks for make_compiled_pathname. Martin v. Löwis <martin@v.loewis.de> parents: 73063 diff changeset	3937
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	3938 cpathname = make_compiled_pathname(pathname, debug);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3939 Py_DECREF(pathname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3940
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3941 if (cpathname == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3942 PyErr_Format(PyExc_SystemError, "path buffer too short");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3943 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3944 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3945 return cpathname;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3946 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3947
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3948 PyDoc_STRVAR(doc_cache_from_source,
73321 425591f6c2a5 Add signatures to the docstring of functions added to imp by PEP 3147 Éric Araujo <merwok@netwok.org> parents: 73205 diff changeset	3949 "cache_from_source(path, [debug_override]) -> path\n\
425591f6c2a5 Add signatures to the docstring of functions added to imp by PEP 3147 Éric Araujo <merwok@netwok.org> parents: 73205 diff changeset	3950 Given the path to a .py file, return the path to its .pyc/.pyo file.\n\
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3951 \n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3952 The .py file does not need to exist; this simply returns the path to the\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3953 .pyc/.pyo file calculated as if the .py file were imported. The extension\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3954 will be .pyc unless __debug__ is not defined, then it will be .pyo.\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3955 \n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3956 If debug_override is not None, then it must be a boolean and is taken as\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3957 the value of __debug__ instead.");
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3958
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3959 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3960 imp_source_from_cache(PyObject self, PyObject args, PyObject *kws)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3961 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3962 static char *kwlist[] = {"path", NULL};
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3963 PyObject pathname, source;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3964
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3965 if (!PyArg_ParseTupleAndKeywords(
66650 523a6fc53a70 import: use PyUnicode_FSConverter to support bytes path and PEP 383 Victor Stinner <victor.stinner@haypocalc.com> parents: 66599 diff changeset	3966 args, kws, "O&", kwlist,
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3967 PyUnicode_FSDecoder, &pathname))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3968 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3969
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3970 source = make_source_pathname(pathname);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3971 if (source == NULL) {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3972 PyErr_Format(PyExc_ValueError, "Not a PEP 3147 pyc path: %R",
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3973 pathname);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3974 Py_DECREF(pathname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3975 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3976 }
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3977 Py_DECREF(pathname);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3978 return source;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3979 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3980
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3981 PyDoc_STRVAR(doc_source_from_cache,
73321 425591f6c2a5 Add signatures to the docstring of functions added to imp by PEP 3147 Éric Araujo <merwok@netwok.org> parents: 73205 diff changeset	3982 "source_from_cache(path) -> path\n\
425591f6c2a5 Add signatures to the docstring of functions added to imp by PEP 3147 Éric Araujo <merwok@netwok.org> parents: 73205 diff changeset	3983 Given the path to a .pyc./.pyo file, return the path to its .py file.\n\
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3984 \n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3985 The .pyc/.pyo file does not need to exist; this simply returns the path to\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3986 the .py file calculated to correspond to the .pyc/.pyo file. If path\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3987 does not conform to PEP 3147 format, ValueError will be raised.");
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3988
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3989 /* Doc strings */
6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3990
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3991 PyDoc_STRVAR(doc_imp,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3992 "This module provides the components needed to build your own\n\
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3993 __import__ function. Undocumented functions are obsolete.");
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3994
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3995 PyDoc_STRVAR(doc_find_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3996 "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	3997 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	3998 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	3999 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	4000 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	4001
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4002 PyDoc_STRVAR(doc_load_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4003 "load_module(name, file, filename, (suffix, mode, type)) -> module\n\
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	4004 Load a module, given information returned by find_module().\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4005 The module name must include the full package name, if any.");
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	4006
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4007 PyDoc_STRVAR(doc_get_magic,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4008 "get_magic() -> string\n\
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4009 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	4010
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	4011 PyDoc_STRVAR(doc_get_tag,
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	4012 "get_tag() -> string\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	4013 Return the magic tag for .pyc or .pyo files.");
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	4014
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4015 PyDoc_STRVAR(doc_get_suffixes,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4016 "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	4017 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	4018 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	4019
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4020 PyDoc_STRVAR(doc_new_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4021 "new_module(name) -> module\n\
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	4022 Create a new module. Do not enter it in sys.modules.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4023 The module name must include the full package name, if any.");
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	4024
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	4025 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	4026 "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	4027 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	4028 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	4029
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	4030 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	4031 "acquire_lock() -> None\n\
27853 5620b0786271 Cleanup from patch #683257: Neal Norwitz <nnorwitz@gmail.com> parents: 27852 diff changeset	4032 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	4033 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	4034 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	4035 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	4036
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	4037 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	4038 "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	4039 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	4040 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	4041
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	4042 static PyMethodDef imp_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4043 {"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	4044 {"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	4045 {"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	4046 {"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	4047 {"load_module", imp_load_module, METH_VARARGS, doc_load_module},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4048 {"new_module", imp_new_module, METH_VARARGS, doc_new_module},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4049 {"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	4050 {"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	4051 {"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	4052 {"reload", imp_reload, METH_O, doc_reload},
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	4053 {"cache_from_source", (PyCFunction)imp_cache_from_source,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	4054 METH_VARARGS \| METH_KEYWORDS, doc_cache_from_source},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	4055 {"source_from_cache", (PyCFunction)imp_source_from_cache,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	4056 METH_VARARGS \| METH_KEYWORDS, doc_source_from_cache},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4057 /* The rest are obsolete */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4058 {"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	4059 {"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	4060 {"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	4061 {"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	4062 {"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	4063 {"is_frozen", imp_is_frozen, METH_VARARGS},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4064 {"load_compiled", imp_load_compiled, METH_VARARGS},
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	4065 #ifdef HAVE_DYNAMIC_LOADING
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4066 {"load_dynamic", imp_load_dynamic, METH_VARARGS},
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	4067 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4068 {"load_package", imp_load_package, METH_VARARGS},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4069 {"load_source", imp_load_source, METH_VARARGS},
68887 5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	4070 {"_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	4071 {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	4072 };
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	4073
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8613 diff changeset	4074 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	4075 setint(PyObject d, char name, int value)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	4076 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4077 PyObject *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4078 int err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4079
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4080 v = PyLong_FromLong((long)value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4081 err = PyDict_SetItemString(d, name, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4082 Py_XDECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4083 return err;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	4084 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	4085
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4086 typedef struct {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4087 PyObject_HEAD
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4088 } NullImporter;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4089
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4090 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4091 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	4092 {
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4093 #ifndef MS_WINDOWS
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4094 PyObject *path;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4095 struct stat statbuf;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4096 int rv;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4097
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4098 if (!_PyArg_NoKeywords("NullImporter()", kwds))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4099 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4100
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4101 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	4102 PyUnicode_FSConverter, &path))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4103 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4104
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4105 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	4106 Py_DECREF(path);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4107 PyErr_SetString(PyExc_ImportError, "empty pathname");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4108 return -1;
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4109 }
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4110
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4111 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	4112 Py_DECREF(path);
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4113 if (rv == 0) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4114 /* it exists */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4115 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	4116 /* it's a directory */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4117 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	4118 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4119 }
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4120 }
50991 a823c9f3a452 Merged revisions 68457 via svnmerge from Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 50619 diff changeset	4121 #else /* MS_WINDOWS */
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4122 PyObject *pathobj;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4123 DWORD rv;
65008 c620fe87c703 Issue #9979: Use PyUnicode_AsWideCharString() in import.c Victor Stinner <victor.stinner@haypocalc.com> parents: 64838 diff changeset	4124 wchar_t *path;
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4125
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4126 if (!_PyArg_NoKeywords("NullImporter()", kwds))
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4127 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4128
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4129 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	4130 &pathobj))
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4131 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4132
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 72454 diff changeset	4133 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	4134 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	4135 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4136 }
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4137
65157 e3ae5b00ba15 PyUnicode_AsWideCharString() takes a PyObject, not a PyUnicodeObject Victor Stinner <victor.stinner@haypocalc.com> parents: 65027 diff changeset	4138 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	4139 if (path == NULL)
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4140 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4141 /* see issue1293 and issue3677:
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4142 * 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	4143 * "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	4144 */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4145 rv = GetFileAttributesW(path);
65008 c620fe87c703 Issue #9979: Use PyUnicode_AsWideCharString() in import.c Victor Stinner <victor.stinner@haypocalc.com> parents: 64838 diff changeset	4146 PyMem_Free(path);
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4147 if (rv != INVALID_FILE_ATTRIBUTES) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4148 /* it exists */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4149 if (rv & FILE_ATTRIBUTE_DIRECTORY) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4150 /* it's a directory */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4151 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	4152 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4153 }
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4154 }
50991 a823c9f3a452 Merged revisions 68457 via svnmerge from Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 50619 diff changeset	4155 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4156 return 0;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4157 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4158
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4159 static PyObject *
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4160 NullImporter_find_module(NullImporter self, PyObject args)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4161 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4162 Py_RETURN_NONE;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4163 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4164
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4165 static PyMethodDef NullImporter_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4166 {"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	4167 "Always return None"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4168 },
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4169 {NULL} /* Sentinel */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4170 };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4171
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4172
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	4173 PyTypeObject PyNullImporter_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4174 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4175 "imp.NullImporter", /tp_name/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4176 sizeof(NullImporter), /tp_basicsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4177 0, /tp_itemsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4178 0, /tp_dealloc/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4179 0, /tp_print/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4180 0, /tp_getattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4181 0, /tp_setattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4182 0, /tp_reserved/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4183 0, /tp_repr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4184 0, /tp_as_number/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4185 0, /tp_as_sequence/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4186 0, /tp_as_mapping/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4187 0, /tp_hash /
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4188 0, /tp_call/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4189 0, /tp_str/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4190 0, /tp_getattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4191 0, /tp_setattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4192 0, /tp_as_buffer/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4193 Py_TPFLAGS_DEFAULT, /tp_flags/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4194 "Null importer object", /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4195 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4196 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4197 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4198 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4199 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4200 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4201 NullImporter_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4202 0, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4203 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4204 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4205 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4206 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4207 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4208 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4209 (initproc)NullImporter_init, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4210 0, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4211 PyType_GenericNew /* tp_new */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4212 };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4213
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	4214 static struct PyModuleDef impmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4215 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4216 "imp",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4217 doc_imp,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4218 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4219 imp_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4220 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4221 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4222 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4223 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	4224 };
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4225
30311 f003e48f562d Bug #794140: cygwin builds do not embed Jason Tishler <jason@tishler.net> parents: 29812 diff changeset	4226 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	4227 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	4228 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4229 PyObject m, d;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4230
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4231 if (PyType_Ready(&PyNullImporter_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4232 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4233
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4234 m = PyModule_Create(&impmodule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4235 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4236 goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4237 d = PyModule_GetDict(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4238 if (d == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4239 goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4240
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4241 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	4242 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	4243 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	4244 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	4245 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	4246 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	4247 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	4248 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	4249 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	4250 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	4251
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4252 Py_INCREF(&PyNullImporter_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4253 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	4254 return m;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	4255 failure:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4256 Py_XDECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4257 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	4258 }
8330 7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4259
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4260
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12543 diff changeset	4261 /* 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	4262 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	4263 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	4264 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	4265
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4266 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	4267
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4268 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	4269 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	4270 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4271 static struct _inittab *our_copy = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4272 struct _inittab *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4273 int i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4274
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4275 /* 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	4276 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	4277 ;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4278 if (n == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4279 return 0; /* Nothing to do */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4280 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	4281 ;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4282
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4283 /* 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	4284 p = our_copy;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4285 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	4286 if (p == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4287 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4288
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4289 /* 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	4290 if (our_copy != PyImport_Inittab)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4291 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	4292 PyImport_Inittab = our_copy = p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4293 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	4294
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4295 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	4296 }
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4297
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4298 /* 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	4299
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4300 int
52721 54e093bd887e Merged revisions 71031 via svnmerge from Brett Cannon <bcannon@gmail.com> parents: 52547 diff changeset	4301 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	4302 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4303 struct _inittab newtab[2];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4304
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4305 memset(newtab, '\0', sizeof newtab);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4306
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4307 newtab[0].name = (char *)name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4308 newtab[0].initfunc = initfunc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4309
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4310 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	4311 }
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	4312
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	4313 #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	4314 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	4315 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/import.c @ 73592:a16d2a8a07cc