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

annotate Python/import.c @ 70817:dd775b1561ba

Fix markup.

author	Georg Brandl <georg@python.org>
date	Tue, 14 Jun 2011 21:09:55 +0200
parents	d31d141f11b1
children	9a6d9ac6fb2e

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)
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	105 */
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52721 diff changeset	106
64638 20a2153b0dda Fix incorrect comment regarding MAGIC and TAG in import.c Nick Coghlan <ncoghlan@gmail.com> parents: 64621 diff changeset	107 /* 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	108 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	109 due to the addition of new opcodes)
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	110 TAG and PYC_TAG_UNICODE must change for each major Python release. The magic
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	111 number will take care of any bytecode changes that occur during development.
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	112 */
70631 d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	113 #define QUOTE(arg) #arg
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	114 #define STRIFY(name) QUOTE(name)
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	115 #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	116 #define MINOR STRIFY(PY_MINOR_VERSION)
64621 252895d49157 bump magic number for DELETE_DEREF Benjamin Peterson <benjamin@python.org> parents: 64594 diff changeset	117 #define MAGIC (3180 \| ((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	118 #define TAG "cpython-" MAJOR MINOR;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	119 #define CACHEDIR "__pycache__"
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	120 static const Py_UNICODE CACHEDIR_UNICODE[] = {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	121 '_', '_', 'p', 'y', 'c', 'a', 'c', 'h', 'e', '_', '_', '\0'};
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	122 /* Current magic word and string tag as globals. */
12543 c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	123 static long pyc_magic = MAGIC;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	124 static const char *pyc_tag = TAG;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	125 static const Py_UNICODE PYC_TAG_UNICODE[] = {
70631 d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	126 'c', 'p', 'y', 't', 'h', 'o', 'n', '-', PY_MAJOR_VERSION + 48, PY_MINOR_VERSION + 48, '\0'};
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	127 #undef QUOTE
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	128 #undef STRIFY
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	129 #undef MAJOR
d31d141f11b1 some horrible preprocessing tricks to automatically update the tag Benjamin Peterson <benjamin@python.org> parents: 70396 diff changeset	130 #undef MINOR
12543 c8dbd5f70288 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12536 diff changeset	131
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	132 /* See _PyImport_FixupExtensionObject() below */
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	133 static PyObject *extensions = NULL;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	134
69148 7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	135 /* Function from Parser/tokenizer.c */
7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	136 extern char * PyTokenizer_FindEncodingFilename(int, PyObject *);
7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	137
6541 b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	138 /* This table is defined in config.c: */
b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	139 extern struct _inittab _PyImport_Inittab[];
b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	140
b2dfff06789c Instead of using _PyImport_Inittab[] directly, use the new "official" Guido van Rossum <guido@python.org> parents: 6454 diff changeset	141 struct _inittab *PyImport_Inittab = _PyImport_Inittab;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	142
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	143 /* these tables define the module suffixes that Python recognizes */
5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	144 struct filedescr * _PyImport_Filetab = NULL;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	145
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	146 static const struct filedescr _PyImport_StandardFiletab[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	147 {".py", "U", PY_SOURCE},
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23879 diff changeset	148 #ifdef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	149 {".pyw", "U", PY_SOURCE},
21010 4a9a9cc041de Since the MAGIC number scheme is going to break on January 1st, document Tim Peters <tim.peters@gmail.com> parents: 20768 diff changeset	150 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	151 {".pyc", "rb", PY_COMPILED},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	152 {0, 0}
11602 5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	153 };
5738ad737114 In _PyImport_Init(), dynamically construct the table of legal suffixes Guido van Rossum <guido@python.org> parents: 10530 diff changeset	154
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	155 static PyObject *initstr = NULL;
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	156
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	157
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	158 /* Initialize things */
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	159
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	160 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	161 _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	162 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	163 const struct filedescr *scan;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	164 struct filedescr *filetab;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	165 int countD = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	166 int countS = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	167
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	168 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	169 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	170 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	171
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	172 /* prepare _PyImport_Filetab: copy entries from
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	173 _PyImport_DynLoadFiletab and _PyImport_StandardFiletab.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	174 */
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	175 #ifdef HAVE_DYNAMIC_LOADING
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	176 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	177 ++countD;
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	178 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	179 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	180 ++countS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	181 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	182 if (filetab == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	183 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	184 #ifdef HAVE_DYNAMIC_LOADING
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	185 memcpy(filetab, _PyImport_DynLoadFiletab,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	186 countD * sizeof(struct filedescr));
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42622 diff changeset	187 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	188 memcpy(filetab + countD, _PyImport_StandardFiletab,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	189 countS * sizeof(struct filedescr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	190 filetab[countD + countS].suffix = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	191
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	192 _PyImport_Filetab = filetab;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	193
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	194 if (Py_OptimizeFlag) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	195 /* 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	196 for (; filetab->suffix != NULL; filetab++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	197 if (strcmp(filetab->suffix, ".pyc") == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	198 filetab->suffix = ".pyo";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	199 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	200 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	201 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	202
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	203 void
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	204 _PyImportHooks_Init(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	205 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	206 PyObject v, path_hooks = NULL, *zimpimport;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	207 int err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	208
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	209 /* 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	210 zipimport */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	211 if (PyType_Ready(&PyNullImporter_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	212 goto error;
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 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	215 PySys_WriteStderr("# installing zipimport hook\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	216
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	217 v = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	218 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	219 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	220 err = PySys_SetObject("meta_path", v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	221 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	222 if (err)
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 v = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	225 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	226 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	227 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	228 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	229 if (err)
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 path_hooks = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	232 if (path_hooks == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	233 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	234 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	235 if (err) {
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	236 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	237 PyErr_Print();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	238 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	239 "path_importer_cache, or NullImporter failed"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	240 );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	241 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	242
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	243 zimpimport = PyImport_ImportModule("zipimport");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	244 if (zimpimport == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	245 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	246 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	247 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	248 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	249 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	250 PyObject *zipimporter = PyObject_GetAttrString(zimpimport,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	251 "zipimporter");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	252 Py_DECREF(zimpimport);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	253 if (zipimporter == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	254 PyErr_Clear(); /* No zipimporter object -- okay */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	255 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	256 PySys_WriteStderr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	257 "# can't import zipimport.zipimporter\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	258 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	259 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	260 /* sys.path_hooks.append(zipimporter) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	261 err = PyList_Append(path_hooks, zipimporter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	262 Py_DECREF(zipimporter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	263 if (err)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	264 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	265 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	266 PySys_WriteStderr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	267 "# installed zipimport hook\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	268 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	269 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	270 Py_DECREF(path_hooks);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	271 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	272
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	273 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	274 _PyImport_Fini(void)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	275 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	276 Py_XDECREF(extensions);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	277 extensions = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	278 PyMem_DEL(_PyImport_Filetab);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	279 _PyImport_Filetab = NULL;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	280 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	281
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	282
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	283 /* 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	284 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	285 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	286
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	287 #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	288
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9187 diff changeset	289 #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	290
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9431 diff changeset	291 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	292 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	293 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	294
56382 2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	295 void
2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	296 _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	297 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	298 long me = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	299 if (me == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	300 return; /* Too bad */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	301 if (import_lock == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	302 import_lock = PyThread_allocate_lock();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	303 if (import_lock == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	304 return; /* Nothing much we can do. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	305 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	306 if (import_lock_thread == me) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	307 import_lock_level++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	308 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	309 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	310 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	311 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	312 PyThreadState *tstate = PyEval_SaveThread();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	313 PyThread_acquire_lock(import_lock, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	314 PyEval_RestoreThread(tstate);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	315 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	316 import_lock_thread = me;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	317 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	318 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	319
56382 2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	320 int
2e4d7a40c2dd Merged revisions 75246 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55584 diff changeset	321 _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	322 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	323 long me = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	324 if (me == -1 \|\| import_lock == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	325 return 0; /* Too bad */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	326 if (import_lock_thread != me)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	327 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	328 import_lock_level--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	329 if (import_lock_level == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	330 import_lock_thread = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	331 PyThread_release_lock(import_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	332 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	333 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	334 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	335
59235 58c35495a934 Merged revisions 78527,78550 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 59213 diff changeset	336 /* 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	337 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	338 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	339 (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	340
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	341 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	342 _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	343 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	344 if (import_lock != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	345 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	346 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	347 /* 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	348 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	349 PyThread_acquire_lock(import_lock, 0);
68708 a9d6c7e15456 import.c: replace tab by spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 68258 diff changeset	350 /* 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	351 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	352 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	353 } 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	354 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	355 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	356 }
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	357 }
724bbd489ad4 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35542 diff changeset	358
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	359 #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	360
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	361 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	362 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	363 {
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	364 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	365 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	366 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	367 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	368 #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	369 }
1be18ef869a4 Add a new function imp.lock_held(), and use it to skip test_threaded_import Tim Peters <tim.peters@gmail.com> parents: 19238 diff changeset	370
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 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	372 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	373 {
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	374 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	375 _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	376 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	377 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	378 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	379 }
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	380
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	381 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	382 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	383 {
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	384 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	385 if (_PyImport_ReleaseLock() < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	386 PyErr_SetString(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	387 "not holding the import lock");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	388 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	389 }
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	390 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	391 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	392 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	393 }
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	394
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	395 static void
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	396 imp_modules_reloading_clear(void)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	397 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	398 PyInterpreterState *interp = PyThreadState_Get()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	399 if (interp->modules_reloading != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	400 PyDict_Clear(interp->modules_reloading);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	401 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	402
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	403 /* Helper for sys */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	404
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	405 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	406 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	407 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	408 PyInterpreterState *interp = PyThreadState_GET()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	409 if (interp->modules == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	410 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	411 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	412 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	413
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	414
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	415 /* 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	416 static char* sys_deletes[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	417 "path", "argv", "ps1", "ps2",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	418 "last_type", "last_value", "last_traceback",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	419 "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	420 /* misc stuff */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	421 "flags", "float_info",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	422 NULL
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	423 };
fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	424
7403 185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	425 static char* sys_files[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	426 "stdin", "__stdin__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	427 "stdout", "__stdout__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	428 "stderr", "__stderr__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	429 NULL
7403 185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	430 };
185c1d47ce7a Moved clear_carefully() to _PyModule_Clear() in moduleobject.c Guido van Rossum <guido@python.org> parents: 7367 diff changeset	431
7202 fed3d200fb56 Two more refinements of the cleanup process. Guido van Rossum <guido@python.org> parents: 7111 diff changeset	432
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	433 /* Un-initialize things, as good as we can */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	434
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	435 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	436 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	437 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	438 Py_ssize_t pos, ndone;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	439 PyObject key, value, *dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	440 PyInterpreterState *interp = PyThreadState_GET()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	441 PyObject *modules = interp->modules;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	442
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	443 if (modules == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	444 return; /* Already done */
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 /* 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	447 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	448 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	449 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	450 destruction order. Sigh. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	451
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	452 value = PyDict_GetItemString(modules, "builtins");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	453 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	454 dict = PyModule_GetDict(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	455 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	456 PySys_WriteStderr("# clear builtins._\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	457 PyDict_SetItemString(dict, "_", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	458 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	459 value = PyDict_GetItemString(modules, "sys");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	460 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	461 char **p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	462 PyObject *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	463 dict = PyModule_GetDict(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	464 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	465 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	466 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	467 PyDict_SetItemString(dict, *p, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	468 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	469 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	470 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	471 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	472 v = PyDict_GetItemString(dict, *(p+1));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	473 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	474 v = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	475 PyDict_SetItemString(dict, *p, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	476 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	477 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	478
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	479 /* First, delete __main__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	480 value = PyDict_GetItemString(modules, "__main__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	481 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	482 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	483 PySys_WriteStderr("# cleanup __main__\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	484 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	485 PyDict_SetItemString(modules, "__main__", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	486 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	487
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	488 /* 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	489 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	490 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	491 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	492 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	493 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	494 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	495
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	496 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	497 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	498 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	499 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	500 re-imported. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	501
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	502 /* 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	503 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	504 do {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	505 ndone = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	506 pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	507 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	508 if (value->ob_refcnt != 1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	509 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	510 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	511 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	512 continue;
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	513 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	514 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	515 if (Py_VerboseFlag)
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	516 PySys_FormatStderr(
b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	517 "# cleanup[1] %U\n", key);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	518 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	519 PyDict_SetItem(modules, key, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	520 ndone++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	521 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	522 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	523 } while (ndone > 0);
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 /* 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	526 pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	527 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	528 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	529 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	530 continue;
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	531 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	532 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	533 if (Py_VerboseFlag)
68710 b50a0d44545a Issue #3080: PyImport_Cleanup() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68708 diff changeset	534 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	535 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	536 PyDict_SetItem(modules, key, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	537 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	538 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	539
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	540 /* 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	541 value = PyDict_GetItemString(modules, "sys");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	542 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	543 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	544 PySys_WriteStderr("# cleanup sys\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	545 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	546 PyDict_SetItemString(modules, "sys", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	547 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	548 value = PyDict_GetItemString(modules, "builtins");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	549 if (value != NULL && PyModule_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	550 if (Py_VerboseFlag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	551 PySys_WriteStderr("# cleanup builtins\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	552 _PyModule_Clear(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	553 PyDict_SetItemString(modules, "builtins", Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	554 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	555
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	556 /* 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	557 PyDict_Clear(modules);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	558 interp->modules = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	559 Py_DECREF(modules);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	560 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	561 }
166 28923e44254c Added forward declaration (to satisfy Standard C). Guido van Rossum <guido@python.org> parents: 145 diff changeset	562
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	563
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	564 /* 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	565
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	566 long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	567 PyImport_GetMagicNumber(void)
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	568 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	569 return pyc_magic;
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	570 }
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1877 diff changeset	571
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	572
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	573 const char *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	574 PyImport_GetMagicTag(void)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	575 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	576 return pyc_tag;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	577 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	578
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	579 /* 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	580 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	581 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	582 (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	583 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	584 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	585 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	586 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	587 _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	588
62385 46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	589 Modules which do support multiple initialization set their m_size
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	590 field to a non-negative number (indicating the size of the
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	591 module-specific state). They are still recorded in the extensions
46ab5e4dba6b Typo repair. Barry Warsaw <barry@python.org> parents: 61597 diff changeset	592 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	593 */
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	594
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	595 int
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	596 _PyImport_FixupExtensionObject(PyObject mod, PyObject name,
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	597 PyObject *filename)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	598 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	599 PyObject modules, dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	600 struct PyModuleDef *def;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	601 if (extensions == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	602 extensions = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	603 if (extensions == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	604 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	605 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	606 if (mod == NULL \|\| !PyModule_Check(mod)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	607 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	608 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	609 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	610 def = PyModule_GetDef(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	611 if (!def) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	612 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	613 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	614 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	615 modules = PyImport_GetModuleDict();
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	616 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	617 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	618 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	619 PyDict_DelItem(modules, name);
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 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	622 if (def->m_size == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	623 if (def->m_base.m_copy) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	624 /* Somebody already imported the module,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	625 likely under a different name.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	626 XXX this should really not happen. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	627 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	628 def->m_base.m_copy = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	629 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	630 dict = PyModule_GetDict(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	631 if (dict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	632 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	633 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	634 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	635 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	636 }
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	637 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	638 return 0;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	639 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	640
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	641 int
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	642 _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	643 {
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	644 int res;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	645 PyObject *nameobj;
68713 ced52fcd95f6 Issue #3080: Use PyUnicode_InternFromString() for builtins Victor Stinner <victor.stinner@haypocalc.com> parents: 68712 diff changeset	646 nameobj = PyUnicode_InternFromString(name);
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	647 if (nameobj == NULL)
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	648 return -1;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	649 res = _PyImport_FixupExtensionObject(mod, nameobj, nameobj);
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	650 Py_DECREF(nameobj);
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	651 return res;
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	652 }
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	653
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5894 diff changeset	654 PyObject *
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	655 _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	656 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	657 PyObject mod, mdict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	658 PyModuleDef* def;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	659 if (extensions == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	660 return NULL;
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	661 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	662 if (def == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	663 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	664 if (def->m_size == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	665 /* Module does not support repeated initialization */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	666 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	667 return NULL;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	668 mod = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	669 if (mod == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	670 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	671 mdict = PyModule_GetDict(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	672 if (mdict == 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 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	675 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	676 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	677 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	678 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	679 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	680 mod = def->m_base.m_init();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	681 if (mod == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	682 return NULL;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	683 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	684 Py_DECREF(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	685 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	686 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	687 PyDict_DelItem(PyImport_GetModuleDict(), name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	688 Py_DECREF(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	689 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	690 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	691 if (Py_VerboseFlag)
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	692 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	693 name, filename);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	694 return mod;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	695
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	696 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	697
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	698 PyObject *
68110 44cc9ef43127 Issue #3080: Mark _PyImport_FindBuiltin() argument as constant Victor Stinner <victor.stinner@haypocalc.com> parents: 68107 diff changeset	699 _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	700 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	701 PyObject res, nameobj;
68713 ced52fcd95f6 Issue #3080: Use PyUnicode_InternFromString() for builtins Victor Stinner <victor.stinner@haypocalc.com> parents: 68712 diff changeset	702 nameobj = PyUnicode_InternFromString(name);
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	703 if (nameobj == NULL)
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	704 return NULL;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	705 res = _PyImport_FindExtensionObject(nameobj, nameobj);
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	706 Py_DECREF(nameobj);
65418 fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	707 return res;
fd5135cbd928 _PyImport_FixupExtension() and _PyImport_FindExtension() uses FS encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65391 diff changeset	708 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	709
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	710 /* 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	711 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	712 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	713 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	714 '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	715
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	716 PyObject *
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	717 PyImport_AddModuleObject(PyObject *name)
40 f28ac7f621c7 Added reload() functionality. Guido van Rossum <guido@python.org> parents: 6 diff changeset	718 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	719 PyObject *modules = PyImport_GetModuleDict();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	720 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	721
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	722 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	723 PyModule_Check(m))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	724 return m;
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	725 m = PyModule_NewObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	726 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	727 return NULL;
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	728 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	729 Py_DECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	730 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	731 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	732 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	733
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	734 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	735 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	736
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	737 PyObject *
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	738 PyImport_AddModule(const char *name)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	739 {
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	740 PyObject nameobj, module;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	741 nameobj = PyUnicode_FromString(name);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	742 if (nameobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	743 return NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	744 module = PyImport_AddModuleObject(nameobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	745 Py_DECREF(nameobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	746 return module;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	747 }
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	748
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	749
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	750 /* 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	751 static void
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	752 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	753 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	754 PyObject *modules = PyImport_GetModuleDict();
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	755 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	756 return;
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	757 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	758 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	759 "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	760 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	761
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	762 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	763 static PyObject make_source_pathname(PyObject pathname);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	764 static PyObject* make_compiled_pathname(Py_UNICODE *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	765
2198 27557e70a8f0 fix import related leaks Guido van Rossum <guido@python.org> parents: 2128 diff changeset	766 /* 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	767 * 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	768 * 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	769 * 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	770 * 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	771 * example.
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	772 *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	773 * Note that PyImport_ExecCodeModuleWithPathnames() is the preferred, richer
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	774 * 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	775 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	776 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	777 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	778 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	779 return PyImport_ExecCodeModuleWithPathnames(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	780 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	781 }
74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	782
74c57288a02b Added PyImport_ExecCodeModuleEx(), which adds an extra parameter to Guido van Rossum <guido@python.org> parents: 7202 diff changeset	783 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	784 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	785 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	786 return PyImport_ExecCodeModuleWithPathnames(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	787 name, co, pathname, (char *)NULL);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	788 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	789
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	790 PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	791 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	792 char *cpathname)
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	793 {
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	794 PyObject *m = NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	795 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	796
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	797 nameobj = PyUnicode_FromString(name);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	798 if (nameobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	799 return NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	800
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	801 if (pathname != NULL) {
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	802 pathobj = PyUnicode_DecodeFSDefault(pathname);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	803 if (pathobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	804 goto error;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	805 } else
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	806 pathobj = NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	807 if (cpathname != NULL) {
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	808 cpathobj = PyUnicode_DecodeFSDefault(cpathname);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	809 if (cpathobj == NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	810 goto error;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	811 } else
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	812 cpathobj = NULL;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	813 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	814 error:
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	815 Py_DECREF(nameobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	816 Py_XDECREF(pathobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	817 Py_XDECREF(cpathobj);
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	818 return m;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	819 }
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	820
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	821 PyObject*
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	822 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	823 PyObject *cpathname)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	824 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	825 PyObject *modules = PyImport_GetModuleDict();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	826 PyObject m, d, *v;
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	827
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	828 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	829 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	830 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	831 /* 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	832 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	833 d = PyModule_GetDict(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	834 if (PyDict_GetItemString(d, "__builtins__") == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	835 if (PyDict_SetItemString(d, "__builtins__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	836 PyEval_GetBuiltins()) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	837 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	838 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	839 /* 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	840 if (pathname != NULL) {
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	841 v = get_sourcefile(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	842 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	843 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	844 }
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	845 else
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	846 v = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	847 if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	848 v = ((PyCodeObject *)co)->co_filename;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	849 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	850 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	851 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	852 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	853 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	854
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	855 /* 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	856 if (cpathname != NULL)
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	857 v = cpathname;
0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	858 else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	859 v = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	860 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	861 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	862
66664 62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 66650 diff changeset	863 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	864 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	865 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	866 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	867
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	868 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	869 PyErr_Format(PyExc_ImportError,
68229 0e7180e4c3cd Issue #3080: Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68110 diff changeset	870 "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	871 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	872 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	873 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	874
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	875 Py_INCREF(m);
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 return m;
32882 331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	878
331e60d8ce6d PyImport_ExecCodeModuleEx(): remove module from sys.modules in error cases. Tim Peters <tim.peters@gmail.com> parents: 32879 diff changeset	879 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	880 remove_module(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	881 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	882 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	883
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	884
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	885 /* Like strrchr(string, '/') but searches for the rightmost of either SEP
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	886 or ALTSEP, if the latter is defined.
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	887 */
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	888 static Py_UNICODE*
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	889 rightmost_sep(Py_UNICODE *s)
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	890 {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	891 Py_UNICODE *found, c;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	892 for (found = NULL; (c = *s); s++) {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	893 if (c == SEP
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	894 #ifdef ALTSEP
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	895 \|\| c == ALTSEP
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	896 #endif
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	897 )
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	898 {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	899 found = s;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	900 }
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	901 }
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	902 return found;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	903 }
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	904
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	905
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	906 /* 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	907 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	908 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	909 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	910
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	911 foo.py -> __pycache__/foo.<tag>.pyc */
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	912
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	913 static PyObject*
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	914 make_compiled_pathname(Py_UNICODE *pathname, int debug)
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	915 {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	916 Py_UNICODE buf[MAXPATHLEN];
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	917 size_t buflen = (size_t)MAXPATHLEN;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	918 size_t len = Py_UNICODE_strlen(pathname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	919 size_t i, save;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	920 Py_UNICODE *pos;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	921 int sep = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	922
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	923 /* Sanity check that the buffer has roughly enough space to hold what
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	924 will eventually be the full path to the compiled file. The 5 extra
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	925 bytes include the slash afer __pycache__, the two extra dots, the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	926 extra trailing character ('c' or 'o') and null. This isn't exact
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	927 because the contents of the buffer can affect how many actual
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	928 characters of the string get into the buffer. We'll do a final
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	929 sanity check before writing the extension to ensure we do not
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	930 overflow the buffer.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	931 */
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	932 if (len + Py_UNICODE_strlen(CACHEDIR_UNICODE) + Py_UNICODE_strlen(PYC_TAG_UNICODE) + 5 > buflen)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	933 return NULL;
18992 7fa1f87ca6b2 Derived from SF patch #446899 Permit import of .pyw under Windows, from Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	934
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	935 /* Find the last path separator and copy everything from the start of
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	936 the source string up to and including the separator.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	937 */
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	938 pos = rightmost_sep(pathname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	939 if (pos == NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	940 i = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	941 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	942 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	943 sep = *pos;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	944 i = pos - pathname + 1;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	945 Py_UNICODE_strncpy(buf, pathname, i);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	946 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	947
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	948 save = i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	949 buf[i++] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	950 /* Add __pycache__/ */
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	951 Py_UNICODE_strcat(buf, CACHEDIR_UNICODE);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	952 i += Py_UNICODE_strlen(CACHEDIR_UNICODE) - 1;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	953 buf[i++] = sep;
68737 238cbd559e9c Fix imp.cache_from_source() if the directory name contains a dot Victor Stinner <victor.stinner@haypocalc.com> parents: 68736 diff changeset	954 buf[i] = '\0';
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	955 /* Add the base filename, but remove the .py or .pyw extension, since
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	956 the tag name must go before the extension.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	957 */
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	958 Py_UNICODE_strcat(buf, pathname + save);
68737 238cbd559e9c Fix imp.cache_from_source() if the directory name contains a dot Victor Stinner <victor.stinner@haypocalc.com> parents: 68736 diff changeset	959 pos = Py_UNICODE_strrchr(buf + i, '.');
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	960 if (pos != NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	961 *++pos = '\0';
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	962 Py_UNICODE_strcat(buf, PYC_TAG_UNICODE);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	963 /* The length test above assumes that we're only adding one character
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	964 to the end of what would normally be the extension. What if there
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	965 is no extension, or the string ends in '.' or '.p', and otherwise
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	966 fills the buffer? By appending 4 more characters onto the string
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	967 here, we could overrun the buffer.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	968
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	969 As a simple example, let's say buflen=32 and the input string is
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	970 'xxx.py'. strlen() would be 6 and the test above would yield:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	971
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	972 (6 + 11 + 10 + 5 == 32) > 32
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	973
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	974 which is false and so the name mangling would continue. This would
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	975 be fine because we'd end up with this string in buf:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	976
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	977 __pycache__/xxx.cpython-32.pyc\0
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	978
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	979 strlen(of that) == 30 + the nul fits inside a 32 character buffer.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	980 We can even handle an input string of say 'xxxxx' above because
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	981 that's (5 + 11 + 10 + 5 == 31) > 32 which is also false. Name
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	982 mangling that yields:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	983
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	984 __pycache__/xxxxxcpython-32.pyc\0
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	985
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	986 which is 32 characters including the nul, and thus fits in the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	987 buffer. However, an input string of 'xxxxxx' would yield a result
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	988 string of:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	989
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	990 __pycache__/xxxxxxcpython-32.pyc\0
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	991
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	992 which is 33 characters long (including the nul), thus overflowing
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	993 the buffer, even though the first test would fail, i.e.: the input
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	994 string is also 6 characters long, so 32 > 32 is false.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	995
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	996 The reason the first test fails but we still overflow the buffer is
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	997 that the test above only expects to add one extra character to be
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	998 added to the extension, and here we're adding three (pyc). We
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	999 don't add the first dot, so that reclaims one of expected
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1000 positions, leaving us overflowing by 1 byte (3 extra - 1 reclaimed
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1001 dot - 1 expected extra == 1 overflowed).
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1002
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1003 The best we can do is ensure that we still have enough room in the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1004 target buffer before we write the extension. Because it's always
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1005 only the extension that can cause the overflow, and never the other
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1006 path bytes we've written, it's sufficient to just do one more test
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1007 here. Still, the assertion that follows can't hurt.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1008 */
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	1009 #if 0
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1010 printf("strlen(buf): %d; buflen: %d\n", (int)strlen(buf), (int)buflen);
18992 7fa1f87ca6b2 Derived from SF patch #446899 Permit import of .pyw under Windows, from Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1011 #endif
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1012 len = Py_UNICODE_strlen(buf);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1013 if (len + 5 > buflen)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1014 return NULL;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1015 buf[len] = '.'; len++;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1016 buf[len] = 'p'; len++;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1017 buf[len] = 'y'; len++;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1018 buf[len] = debug ? 'c' : 'o'; len++;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1019 assert(len <= buflen);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1020 return PyUnicode_FromUnicode(buf, len);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1021 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1022
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1023
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	1024 /* 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	1025 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	1026 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	1027 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	1028 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	1029
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1030 (...)/__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	1031
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1032 static PyObject*
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1033 make_source_pathname(PyObject *pathobj)
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	1034 {
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1035 Py_UNICODE buf[MAXPATHLEN];
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1036 Py_UNICODE *pathname;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1037 Py_UNICODE left, right, dot0, dot1, sep;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1038 size_t i, j;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1039
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1040 if (PyUnicode_GET_SIZE(pathobj) > MAXPATHLEN)
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1041 return NULL;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1042 pathname = PyUnicode_AS_UNICODE(pathobj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1043
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1044 /* 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	1045 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	1046 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	1047 */
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1048 right = rightmost_sep(pathname);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1049 if (right == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1050 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1051 sep = *right;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1052 *right = '\0';
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1053 left = rightmost_sep(pathname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1054 *right = sep;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1055 if (left == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1056 left = pathname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1057 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1058 left++;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1059 if (right-left != Py_UNICODE_strlen(CACHEDIR_UNICODE) \|\|
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1060 Py_UNICODE_strncmp(left, CACHEDIR_UNICODE, right-left) != 0)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1061 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1062
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1063 /* 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	1064 has two dots in it.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1065 */
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1066 if ((dot0 = Py_UNICODE_strchr(right + 1, '.')) == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1067 return NULL;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1068 if ((dot1 = Py_UNICODE_strchr(dot0 + 1, '.')) == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1069 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1070 /* Too many dots? */
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1071 if (Py_UNICODE_strchr(dot1 + 1, '.') != NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1072 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1073
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1074 /* 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	1075 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	1076 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	1077 suffix.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1078 */
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1079 Py_UNICODE_strncpy(buf, pathname, (i=left-pathname));
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1080 Py_UNICODE_strncpy(buf+i, right+1, (j=dot0-right));
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1081 buf[i+j] = 'p';
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1082 buf[i+j+1] = 'y';
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1083 return PyUnicode_FromUnicode(buf, i+j+2);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	1084 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	1085
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1086 /* 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	1087 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	1088 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	1089 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	1090 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	1091 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	1092
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1093 static FILE *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1094 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	1095 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1096 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1097 long magic;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1098 long pyc_mtime;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1099
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1100 fp = _Py_fopen(cpathname, "rb");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1101 if (fp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1102 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1103 magic = PyMarshal_ReadLongFromFile(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1104 if (magic != pyc_magic) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1105 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	1106 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	1107 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1108 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1109 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1110 pyc_mtime = PyMarshal_ReadLongFromFile(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1111 if (pyc_mtime != mtime) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1112 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	1113 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	1114 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1115 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1116 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1117 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	1118 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	1119 return fp;
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	1120 }
2052 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
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1123 /* 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	1124
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1125 static PyCodeObject *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1126 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	1127 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1128 PyObject *co;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1129
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1130 co = PyMarshal_ReadLastObjectFromFile(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1131 if (co == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1132 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1133 if (!PyCode_Check(co)) {
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 "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	1136 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1137 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1138 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1139 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	1140 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1141
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1142
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1143 /* 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	1144 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	1145
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1146 static PyObject *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1147 load_compiled_module(PyObject name, PyObject cpathname, FILE *fp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1148 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1149 long magic;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1150 PyCodeObject *co;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1151 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1152
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1153 magic = PyMarshal_ReadLongFromFile(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1154 if (magic != pyc_magic) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1155 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	1156 "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	1157 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1158 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1159 (void) PyMarshal_ReadLongFromFile(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1160 co = read_compiled_module(cpathname, fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1161 if (co == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1162 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1163 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	1164 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	1165 name, cpathname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1166 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	1167 cpathname, cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1168 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1169
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1170 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	1171 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1172
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1173 /* 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	1174
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1175 static PyCodeObject *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1176 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	1177 {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1178 PyCodeObject *co;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1179 PyObject *pathbytes;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1180 mod_ty mod;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1181 PyCompilerFlags flags;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1182 PyArena *arena;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1183
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1184 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	1185 if (pathbytes == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1186 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1187
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1188 arena = PyArena_New();
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1189 if (arena == NULL) {
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1190 Py_DECREF(pathbytes);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1191 return NULL;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1192 }
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1193
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1194 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	1195 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	1196 Py_file_input, 0, 0, &flags,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1197 NULL, arena);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1198 if (mod != NULL)
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1199 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	1200 else
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1201 co = NULL;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1202 Py_DECREF(pathbytes);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1203 PyArena_Free(arena);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1204 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	1205 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1206
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	1207 /* Helper to open a bytecode file for writing in exclusive mode */
89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1208
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1209 #ifndef MS_WINDOWS
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	1210 static FILE *
45471 7dd2c1746267 Merged revisions 60990-61002 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1211 open_exclusive(char *filename, mode_t mode)
14708 89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1212 {
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	1213 #if defined(O_EXCL)&&defined(O_CREAT)&&defined(O_WRONLY)&&defined(O_TRUNC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1214 /* Use O_EXCL to avoid a race condition when another process tries to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1215 write the same file. When that happens, our open() call fails,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1216 which is just fine (since it's only a cache).
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1217 XXX If the file exists and is writable but the directory is not
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1218 writable, the file will never be written. Oh well.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1219 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1220 int fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1221 (void) unlink(filename);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1222 fd = open(filename, O_EXCL\|O_CREAT\|O_WRONLY\|O_TRUNC
14921 3db8b8031a6a The 2.0b2 change to write .pyc files in exclusive mode (if possible) Tim Peters <tim.peters@gmail.com> parents: 14708 diff changeset	1223 #ifdef O_BINARY
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1224 \|O_BINARY /* necessary for Windows */
14921 3db8b8031a6a The 2.0b2 change to write .pyc files in exclusive mode (if possible) Tim Peters <tim.peters@gmail.com> parents: 14708 diff changeset	1225 #endif
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26461 diff changeset	1226 #ifdef __VMS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1227 , mode, "ctxt=bin", "shr=nil"
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26461 diff changeset	1228 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1229 , mode
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26461 diff changeset	1230 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1231 );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1232 if (fd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1233 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1234 return fdopen(fd, "wb");
14708 89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1235 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1236 /* Best we can do -- on Windows this can't happen anyway */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1237 return fopen(filename, "wb");
14708 89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1238 #endif
89b2aee43e0b On Unix, use O_EXCL when creating the .pyc/.pyo files, to avoid a race condition Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1239 }
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1240 #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	1241
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	1242
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1243 /* 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	1244 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	1245 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	1246 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	1247
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1248 static void
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1249 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	1250 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	1251 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1252 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1253 time_t mtime = srcstat->st_mtime;
55331 c7042127196a Merged revisions 74058 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 52721 diff changeset	1254 #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	1255 mode_t mode = srcstat->st_mode & ~S_IEXEC;
55331 c7042127196a Merged revisions 74058 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 52721 diff changeset	1256 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1257 mode_t mode = srcstat->st_mode & ~S_IXUSR & ~S_IXGRP & ~S_IXOTH;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1258 mode_t dirmode = (srcstat->st_mode \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1259 S_IXUSR \| S_IXGRP \| S_IXOTH \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1260 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	1261 PyObject *dirbytes;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1262 #endif
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1263 #ifdef MS_WINDOWS
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1264 int fd;
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1265 #else
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1266 PyObject *cpathbytes;
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1267 #endif
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1268 PyObject *dirname;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1269 Py_UNICODE *dirsep;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1270 int res, ok;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1271
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1272 /* Ensure that the __pycache__ directory exists. */
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1273 dirsep = rightmost_sep(PyUnicode_AS_UNICODE(cpathname));
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1274 if (dirsep == NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1275 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	1276 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	1277 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1278 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1279 dirname = PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(cpathname),
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1280 dirsep - PyUnicode_AS_UNICODE(cpathname));
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1281 if (dirname == NULL) {
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1282 PyErr_Clear();
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1283 return;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1284 }
64594 84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1285
84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1286 #ifdef MS_WINDOWS
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1287 res = CreateDirectoryW(PyUnicode_AS_UNICODE(dirname), NULL);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1288 ok = (res != 0);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1289 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	1290 ok = 1;
64594 84217b2d8c0c Fix Issue #9752: MSVC compiler warning due to undefined function Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64439 diff changeset	1291 #else
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1292 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	1293 if (dirbytes == NULL) {
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1294 PyErr_Clear();
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1295 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1296 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1297 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	1298 Py_DECREF(dirbytes);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1299 if (0 <= res)
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1300 ok = 1;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1301 else
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1302 ok = (errno == EEXIST);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1303 #endif
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1304 if (!ok) {
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1305 if (Py_VerboseFlag)
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1306 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	1307 Py_DECREF(dirname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1308 return;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1309 }
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1310 Py_DECREF(dirname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1311
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1312 #ifdef MS_WINDOWS
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1313 (void)DeleteFileW(PyUnicode_AS_UNICODE(cpathname));
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1314 fd = _wopen(PyUnicode_AS_UNICODE(cpathname),
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1315 O_EXCL \| O_CREAT \| O_WRONLY \| O_TRUNC \| O_BINARY,
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1316 mode);
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1317 if (0 <= fd)
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1318 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	1319 else
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1320 fp = NULL;
e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 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 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	1323 if (cpathbytes == NULL) {
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1324 PyErr_Clear();
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1325 return;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1326 }
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1327
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1328 fp = open_exclusive(PyBytes_AS_STRING(cpathbytes), mode);
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1329 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1330 if (fp == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1331 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	1332 PySys_FormatStderr(
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1333 "# can't create %R\n", cpathname);
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1334 #ifndef MS_WINDOWS
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1335 Py_DECREF(cpathbytes);
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1336 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1337 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1338 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1339 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	1340 /* First write a 0 for mtime */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1341 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	1342 PyMarshal_WriteObjectToFile((PyObject *)co, fp, Py_MARSHAL_VERSION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1343 if (fflush(fp) != 0 \|\| ferror(fp)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1344 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	1345 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	1346 /* Don't keep partial file */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1347 fclose(fp);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1348 #ifdef MS_WINDOWS
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1349 (void)DeleteFileW(PyUnicode_AS_UNICODE(cpathname));
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1350 #else
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1351 (void) unlink(PyBytes_AS_STRING(cpathbytes));
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1352 Py_DECREF(cpathbytes);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1353 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1354 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1355 }
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1356 #ifndef MS_WINDOWS
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1357 Py_DECREF(cpathbytes);
69463 e4e92d68ba3a Close #11619: write_compiled_module() doesn't encode the filename Victor Stinner <victor.stinner@haypocalc.com> parents: 69148 diff changeset	1358 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1359 /* Now write the true mtime */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1360 fseek(fp, 4L, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1361 assert(mtime < LONG_MAX);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1362 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	1363 fflush(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1364 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1365 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	1366 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	1367 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1368
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1369 static void
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1370 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	1371 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1372 PyObject constants, tmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1373 Py_ssize_t i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1374
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1375 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	1376 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1377
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1378 tmp = co->co_filename;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1379 co->co_filename = newname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1380 Py_INCREF(co->co_filename);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1381 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1382
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1383 constants = co->co_consts;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1384 n = PyTuple_GET_SIZE(constants);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1385 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1386 tmp = PyTuple_GET_ITEM(constants, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1387 if (PyCode_Check(tmp))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1388 update_code_filenames((PyCodeObject *)tmp,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1389 oldname, newname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1390 }
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1391 }
2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1392
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1393 static void
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1394 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	1395 {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1396 PyObject *oldname;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1397
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1398 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	1399 return;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1400
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1401 oldname = co->co_filename;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1402 Py_INCREF(oldname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1403 update_code_filenames(co, oldname, newname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1404 Py_DECREF(oldname);
50619 2ff9910f1526 Merged revisions 68360-68361 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50492 diff changeset	1405 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1406
68887 5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1407 static PyObject *
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1408 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	1409 {
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1410 PyObject *co;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1411 PyObject *file_path;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1412
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1413 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	1414 return NULL;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1415
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1416 if (!PyCode_Check(co)) {
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1417 PyErr_SetString(PyExc_TypeError,
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1418 "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	1419 return NULL;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1420 }
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 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	1423 PyErr_SetString(PyExc_TypeError,
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1424 "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	1425 return NULL;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1426 }
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 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	1429
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1430 Py_RETURN_NONE;
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1431 }
5deb2094f033 Make importlib compatible with __import__ by "fixing" code.co_filename Brett Cannon <brett@python.org> parents: 68826 diff changeset	1432
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1433 /* 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	1434 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	1435 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	1436
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1437 static PyObject *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1438 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	1439 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1440 struct stat st;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1441 FILE *fpc;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1442 PyObject cpathname = NULL, cpathbytes = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1443 PyCodeObject *co;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1444 PyObject *m = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1445
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1446 if (fstat(fileno(fp), &st) != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1447 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	1448 "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	1449 pathname);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1450 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1451 }
13226 12437deb0680 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13181 diff changeset	1452 #if SIZEOF_TIME_T > 4
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1453 /* 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	1454 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	1455 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	1456 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1457 if (st.st_mtime >> 32) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1458 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1459 "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	1460 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1461 }
13226 12437deb0680 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13181 diff changeset	1462 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1463 cpathname = make_compiled_pathname(
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1464 PyUnicode_AS_UNICODE(pathname),
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1465 !Py_OptimizeFlag);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1466
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1467 if (cpathname != NULL)
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1468 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	1469 else
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1470 fpc = NULL;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1471
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1472 if (fpc) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1473 co = read_compiled_module(cpathname, fpc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1474 fclose(fpc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1475 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	1476 goto error;
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1477 update_compiled_module(co, pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1478 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	1479 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	1480 name, cpathname);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1481 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	1482 cpathname, cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1483 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1484 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1485 co = parse_source_module(pathname, fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1486 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	1487 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1488 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	1489 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	1490 name, pathname);
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1491 if (cpathname != NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1492 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	1493 if (ro == NULL \|\| !PyObject_IsTrue(ro))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1494 write_compiled_module(co, cpathname, &st);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1495 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1496 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	1497 pathname, cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1498 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1499 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1500
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1501 error:
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1502 Py_XDECREF(cpathbytes);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	1503 Py_XDECREF(cpathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1504 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	1505 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1506
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	1507 /* 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	1508 * 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	1509 */
73e1bf179a01 Another patch for #1762972: __file__ points to the py file instead pyo/pyc file Christian Heimes <christian@cheimes.de> parents: 44567 diff changeset	1510 static PyObject *
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1511 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	1512 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1513 Py_ssize_t len;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1514 Py_UNICODE *fileuni;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1515 PyObject *py;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1516 struct stat statbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1517
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1518 len = PyUnicode_GET_SIZE(filename);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1519 if (len == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1520 Py_RETURN_NONE;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1521
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1522 /* don't match .pyc or .pyo? */
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1523 fileuni = PyUnicode_AS_UNICODE(filename);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1524 if (len < 5
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1525 \|\| fileuni[len-4] != '.'
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1526 \|\| (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	1527 \|\| (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	1528 goto unchanged;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1529
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1530 /* 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	1531 * 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	1532 * to py.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1533 */
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1534 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	1535 if (py == NULL) {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1536 PyErr_Clear();
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1537 py = PyUnicode_FromUnicode(fileuni, len - 1);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	1538 }
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1539 if (py == NULL)
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1540 goto error;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1541
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1542 if (_Py_stat(py, &statbuf) == 0 && S_ISREG(statbuf.st_mode))
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1543 return py;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1544 Py_DECREF(py);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1545 goto unchanged;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1546
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1547 error:
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1548 PyErr_Clear();
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1549 unchanged:
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1550 Py_INCREF(filename);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1551 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	1552 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1553
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1554 /* Forward */
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	1555 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	1556 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	1557 PyObject , FILE , PyObject **);
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	1558 static struct _frozen * find_frozen(PyObject *);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1559
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1560 /* 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	1561 REFERENCE COUNT */
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1562
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1563 static PyObject *
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1564 load_package(PyObject name, PyObject pathname)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1565 {
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	1566 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	1567 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	1568 int err;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1569 FILE *fp = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1570 struct filedescr *fdp;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1571
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1572 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1573 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1574 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1575 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	1576 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	1577 name, pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1578 file = get_sourcefile(pathname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1579 if (file == NULL)
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1580 return NULL;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1581 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	1582 if (path_list == NULL) {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1583 Py_DECREF(file);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1584 return NULL;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1585 }
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1586 d = PyModule_GetDict(m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1587 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	1588 Py_DECREF(file);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1589 if (err == 0)
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1590 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	1591 if (err != 0) {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1592 Py_DECREF(path_list);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1593 return NULL;
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1594 }
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	1595 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	1596 &bufobj, &fp, NULL);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1597 Py_DECREF(path_list);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1598 if (fdp == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1599 if (PyErr_ExceptionMatches(PyExc_ImportError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1600 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1601 Py_INCREF(m);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1602 return m;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1603 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1604 else
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	1605 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1606 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1607 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	1608 Py_XDECREF(bufobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1609 if (fp != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1610 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1611 return m;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1612 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1613
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1614
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1615 /* Helper to test for built-in module */
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1616
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1617 static int
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1618 is_builtin(PyObject *name)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1619 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	1620 int i, cmp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1621 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	1622 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	1623 if (cmp == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1624 if (PyImport_Inittab[i].initfunc == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1625 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1626 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1627 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1628 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1629 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1630 return 0;
6243 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
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1633
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1634 /* 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	1635 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	1636 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	1637 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	1638 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	1639 import mechanism. Cache the result in path_importer_cache.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1640 Returns a borrowed reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1641
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1642 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1643 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	1644 PyObject *p)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1645 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1646 PyObject *importer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1647 Py_ssize_t j, nhooks;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1648
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1649 /* 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	1650 assert(PyList_Check(path_hooks));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1651 assert(PyDict_Check(path_importer_cache));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1652
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1653 nhooks = PyList_Size(path_hooks);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1654 if (nhooks < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1655 return NULL; /* Shouldn't happen */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1656
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1657 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	1658 if (importer != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1659 return importer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1660
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1661 /* 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	1662 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	1663 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1664
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1665 for (j = 0; j < nhooks; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1666 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	1667 if (hook == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1668 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1669 importer = PyObject_CallFunctionObjArgs(hook, p, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1670 if (importer != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1671 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1672
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1673 if (!PyErr_ExceptionMatches(PyExc_ImportError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1674 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1675 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1676 PyErr_Clear();
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 if (importer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1679 importer = PyObject_CallFunctionObjArgs(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1680 (PyObject *)&PyNullImporter_Type, p, 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 if (importer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1683 if (PyErr_ExceptionMatches(PyExc_ImportError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1684 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1685 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1686 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1687 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1688 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1689 if (importer != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1690 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	1691 Py_DECREF(importer);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1692 if (err != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1693 return NULL;
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 return importer;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1696 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1697
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1698 PyAPI_FUNC(PyObject *)
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1699 PyImport_GetImporter(PyObject *path) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1700 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	1701
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1702 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	1703 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	1704 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	1705 path_hooks, path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1706 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1707 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1708 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	1709 return importer;
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1710 }
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	1711
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	1712 /* 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	1713 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	1714 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	1715
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1716 #ifdef MS_COREDLL
68715 bab42673674a Issue #3080: _PyWin_FindRegisteredModule() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68713 diff changeset	1717 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	1718 PyObject **p_path);
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1719 #endif
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	1720
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1721 /* Forward */
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1722 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	1723 static int find_init_module(PyObject *);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26796 diff changeset	1724 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	1725
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1726 /* 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	1727 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	1728
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1729 -1: error: a Python error occurred
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1730 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	1731 important enough to be reported.
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1732 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	1733 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	1734 and buf is the path /
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1735
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1736 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	1737 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	1738 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	1739 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	1740 {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1741 Py_UNICODE buf[MAXPATHLEN+1];
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1742 Py_ssize_t buflen = MAXPATHLEN+1;
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1743 PyObject path_unicode, filename;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1744 Py_ssize_t len;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1745 struct stat statbuf;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1746 static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1747
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1748 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	1749 Py_INCREF(path);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1750 path_unicode = path;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1751 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1752 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	1753 path_unicode = PyUnicode_DecodeFSDefaultAndSize(
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1754 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	1755 if (path_unicode == NULL)
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1756 return -1;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1757 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1758 else
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1759 return 0;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1760
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1761 len = PyUnicode_GET_SIZE(path_unicode);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1762 if (len + 2 + PyUnicode_GET_SIZE(name) + MAXSUFFIXSIZE >= buflen) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1763 Py_DECREF(path_unicode);
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1764 return 0; /* Too long */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1765 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1766 Py_UNICODE_strcpy(buf, PyUnicode_AS_UNICODE(path_unicode));
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1767 Py_DECREF(path_unicode);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1768
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1769 if (Py_UNICODE_strlen(buf) != len)
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1770 return 0; /* path contains '\0' */
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1771
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1772 /* sys.path_hooks import hook */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1773 if (p_loader != NULL) {
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1774 PyObject *importer;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1775
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1776 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	1777 path_hooks, path);
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1778 if (importer == NULL) {
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1779 return -1;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1780 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1781 /* Note: importer is a borrowed reference */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1782 if (importer != Py_None) {
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1783 PyObject *loader;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1784 loader = PyObject_CallMethod(importer,
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	1785 "find_module", "O", fullname);
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1786 if (loader == NULL)
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1787 return -1; /* error */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1788 if (loader != Py_None) {
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1789 /* a loader was found */
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1790 *p_loader = loader;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1791 *p_fd = &importhookdescr;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1792 return 2;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1793 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1794 Py_DECREF(loader);
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1795 return 0;
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 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1798 /* 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	1799
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1800 if (len > 0 && buf[len-1] != SEP
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1801 #ifdef ALTSEP
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1802 && buf[len-1] != ALTSEP
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1803 #endif
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1804 )
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1805 buf[len++] = SEP;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1806 Py_UNICODE_strcpy(buf+len, PyUnicode_AS_UNICODE(name));
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1807 len += PyUnicode_GET_SIZE(name);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1808
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1809 filename = PyUnicode_FromUnicode(buf, len);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1810 if (filename == NULL)
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1811 return -1;
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 /* 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	1814 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	1815 #ifdef HAVE_STAT
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1816 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	1817 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	1818 {
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1819 int match;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1820
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1821 match = case_ok(filename, 0, name);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1822 if (match < 0) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1823 Py_DECREF(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1824 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1825 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1826 if (match) { /* case matches */
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1827 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	1828 *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	1829 *p_fd = &fd_package;
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1830 return 2;
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1831 }
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1832 else {
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1833 int err;
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1834 err = PyErr_WarnFormat(PyExc_ImportWarning, 1,
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1835 "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	1836 filename);
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1837 if (err) {
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1838 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	1839 return -1;
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	1840 }
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1841 }
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 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1844 #endif
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1845 *p_path = filename;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1846 return 1;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1847 }
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1848
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1849 /* 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	1850 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	1851
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1852 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	1853 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	1854 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	1855
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1856 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	1857
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1858 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	1859 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	1860 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	1861 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	1862 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	1863 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1864 Py_ssize_t i, npath;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1865 struct filedescr *fdp = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1866 char *filemode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1867 FILE *fp = NULL;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1868 PyObject prefix, filename;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1869 int match;
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1870
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1871 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	1872 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	1873 PyObject *path;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1874 int ok;
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 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	1877 if (path == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1878 return NULL;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1879
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1880 prefix = NULL;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1881 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	1882 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	1883 &prefix, p_loader, &fdp);
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1884 if (ok < 0)
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1885 return NULL;
09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1886 if (ok == 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1887 continue;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1888 if (ok == 2) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1889 *p_path = prefix;
68720 09aaac73d9cf Issue #3080: Create find_module_path() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68719 diff changeset	1890 return fdp;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1891 }
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1892
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1893 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	1894 filemode = fdp->mode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1895 if (filemode[0] == 'U')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1896 filemode = "r" PY_STDIOTEXTMODE;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1897
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1898 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	1899 if (filename == NULL) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1900 Py_DECREF(prefix);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1901 return NULL;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1902 }
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1903
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1904 if (Py_VerboseFlag > 1)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1905 PySys_FormatStderr("# trying %R\n", filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1906
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1907 fp = _Py_fopen(filename, filemode);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1908 if (fp == NULL) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1909 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	1910 continue;
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1911 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1912 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	1913 if (match < 0) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1914 Py_DECREF(prefix);
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1915 Py_DECREF(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1916 return NULL;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1917 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1918 if (match) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1919 Py_DECREF(prefix);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1920 *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	1921 *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	1922 return fdp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1923 }
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	1924 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	1925
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1926 fclose(fp);
c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1927 fp = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1928 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1929 Py_DECREF(prefix);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	1930 }
68732 c4ccf02456d6 Issue #3080: Refactor find_module_path(), use return instead of break Victor Stinner <victor.stinner@haypocalc.com> parents: 68731 diff changeset	1931 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	1932 "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	1933 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	1934 }
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	1935
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1936 /* Find a module:
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1937
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1938 - 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	1939 - try find_frozen()
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1940 - try is_builtin()
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1941 - try _PyWin_FindRegisteredModule() (Windows only)
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1942 - 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	1943 NULL) or sys.path
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1944
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1945 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	1946
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1947 Return:
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1948
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1949 - &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	1950 - &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	1951 - &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	1952 if it is a package
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1953 - &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	1954 importer loader was found
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1955 - 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	1956 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	1957 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	1958 - NULL on error
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1959
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1960 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	1961 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	1962 */
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1963
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1964 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	1965 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	1966 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	1967 {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1968 Py_ssize_t i, npath;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1969 static struct filedescr fd_frozen = {"", "", PY_FROZEN};
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1970 static struct filedescr fd_builtin = {"", "", C_BUILTIN};
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1971 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	1972
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	1973 *p_path = NULL;
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1974 *p_fp = NULL;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1975 if (p_loader != NULL)
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1976 *p_loader = NULL;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1977
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	1978 if (PyUnicode_GET_SIZE(name) > MAXPATHLEN) {
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1979 PyErr_SetString(PyExc_OverflowError,
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1980 "module name is too long");
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1981 return NULL;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1982 }
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1983
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1984 /* sys.meta_path import hook */
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1985 if (p_loader != NULL) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1986 PyObject *meta_path;
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 meta_path = PySys_GetObject("meta_path");
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1989 if (meta_path == NULL \|\| !PyList_Check(meta_path)) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1990 PyErr_SetString(PyExc_ImportError,
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1991 "sys.meta_path must be a list of "
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1992 "import hooks");
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1993 return NULL;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1994 }
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1995 Py_INCREF(meta_path); /* zap guard */
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1996 npath = PyList_Size(meta_path);
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1997 for (i = 0; i < npath; i++) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1998 PyObject *loader;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	1999 PyObject *hook = PyList_GetItem(meta_path, i);
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2000 loader = PyObject_CallMethod(hook, "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	2001 "OO", fullname,
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2002 search_path_list != NULL ?
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2003 search_path_list : Py_None);
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2004 if (loader == NULL) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2005 Py_DECREF(meta_path);
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2006 return NULL; /* true error */
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2007 }
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2008 if (loader != Py_None) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2009 /* a loader was found */
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2010 *p_loader = loader;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2011 Py_DECREF(meta_path);
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2012 return &importhookdescr;
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 Py_DECREF(loader);
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2015 }
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2016 Py_DECREF(meta_path);
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
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	2019 if (find_frozen(fullname) != NULL)
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	2020 return &fd_frozen;
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2021
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2022 if (search_path_list == NULL) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2023 #ifdef MS_COREDLL
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2024 FILE *fp;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2025 struct filedescr *fdp;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2026 #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	2027 if (is_builtin(name))
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2028 return &fd_builtin;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2029 #ifdef MS_COREDLL
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2030 fp = _PyWin_FindRegisteredModule(name, &fdp, p_path);
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2031 if (fp != NULL) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2032 *p_fp = fp;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2033 return fdp;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2034 }
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2035 else if (PyErr_Occurred())
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2036 return NULL;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2037 #endif
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2038 search_path_list = PySys_GetObject("path");
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2039 }
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2040
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2041 if (search_path_list == NULL \|\| !PyList_Check(search_path_list)) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2042 PyErr_SetString(PyExc_ImportError,
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2043 "sys.path must be a list of directory names");
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2044 return NULL;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2045 }
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2046
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2047 path_hooks = PySys_GetObject("path_hooks");
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2048 if (path_hooks == NULL \|\| !PyList_Check(path_hooks)) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2049 PyErr_SetString(PyExc_ImportError,
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2050 "sys.path_hooks must be a list of "
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2051 "import hooks");
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2052 return NULL;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2053 }
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2054 path_importer_cache = PySys_GetObject("path_importer_cache");
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2055 if (path_importer_cache == NULL \|\|
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2056 !PyDict_Check(path_importer_cache)) {
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2057 PyErr_SetString(PyExc_ImportError,
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2058 "sys.path_importer_cache must be a dict");
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2059 return NULL;
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2060 }
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2061
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2062 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	2063 search_path_list, path_hooks,
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2064 path_importer_cache,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	2065 p_path, p_fp, p_loader);
68719 a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2066 }
a4d797b9ff63 Issue #3080: Create find_module_path_list() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 68718 diff changeset	2067
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2068 /* 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	2069 * 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	2070 * /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	2071 * ^ ^ ^ ^
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2072 * \|--------------------- buf ---------------------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2073 * \|------------------- len ------------------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2074 * \|------ name -------\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2075 * \|----- namelen -----\|
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2076 * 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	2077 * 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	2078 *
f55f35dc5320 More MacOSX fiddling. As noted in a comment, I believe all variations Tim Peters <tim.peters@gmail.com> parents: 16896 diff changeset	2079 * 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	2080 * 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	2081 *
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2082 * 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	2083 * 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	2084 * 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	2085 *
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2086 * 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	2087 * 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	2088 * 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	2089 * 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	2090 */
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	2091
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2092 /* 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	2093 * 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	2094 */
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	2095 #if defined(MS_WINDOWS)
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	2096 #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	2097
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2098 #elif defined(DJGPP)
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2099 #include <dir.h>
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2100
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	2101 #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	2102 #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	2103 #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	2104
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	2105 #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	2106 #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	2107 #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	2108 #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	2109 #include <os2.h>
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2110 #endif
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2111
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2112 #if defined(DJGPP) \
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2113 \|\| ((defined(__MACH__) && defined(__APPLE__) \|\| defined(__CYGWIN__)) \
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2114 && defined(HAVE_DIRENT_H)) \
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2115 \|\| defined(PYOS_OS2)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2116 # define USE_CASE_OK_BYTES
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2117 #endif
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2118
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2119
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2120 #ifdef USE_CASE_OK_BYTES
7290 72d531d54572 Add case checking feature on import. Guido van Rossum <guido@python.org> parents: 7232 diff changeset	2121 static int
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2122 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	2123 {
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2124 /* 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	2125 * match the sequence just above.
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2126 */
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2127
3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2128 /* DJGPP */
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2129 #if defined(DJGPP)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2130 struct ffblk ffblk;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2131 int done;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2132
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2133 if (Py_GETENV("PYTHONCASEOK") != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2134 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2135
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2136 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	2137 if (done) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2138 PyErr_Format(PyExc_NameError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2139 "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	2140 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	2141 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2142 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2143 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	2144
34961 4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	2145 /* new-fangled macintosh (macosx) or Cygwin */
4a33c58c319c Patch #1197318: Cygwin case-sensitive import patch Jason Tishler <jason@tishler.net> parents: 33680 diff changeset	2146 #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	2147 DIR *dirp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2148 struct dirent *dp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2149 char dirname[MAXPATHLEN + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2150 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	2151
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2152 if (Py_GETENV("PYTHONCASEOK") != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2153 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2154
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2155 /* 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	2156 if (dirlen <= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2157 dirname[0] = '.';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2158 dirname[1] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2159 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2160 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2161 assert(dirlen <= MAXPATHLEN);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2162 memcpy(dirname, buf, dirlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2163 dirname[dirlen] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2164 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2165 /* 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	2166 dirp = opendir(dirname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2167 if (dirp) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2168 char *nameWithExt = buf + len - namelen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2169 while ((dp = readdir(dirp)) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2170 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	2171 #ifdef _DIRENT_HAVE_D_NAMELEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2172 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	2173 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2174 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	2175 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2176 if (thislen >= namelen &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2177 strcmp(dp->d_name, nameWithExt) == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2178 (void)closedir(dirp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2179 return 1; /* Found */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2180 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2181 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2182 (void)closedir(dirp);
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 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	2185
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	2186 /* OS/2 */
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	2187 #elif defined(PYOS_OS2)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2188 HDIR hdir = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2189 ULONG srchcnt = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2190 FILEFINDBUF3 ffbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2191 APIRET rc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2192
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2193 if (Py_GETENV("PYTHONCASEOK") != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2194 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2195
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2196 rc = DosFindFirst(buf,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2197 &hdir,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2198 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	2199 &ffbuf, sizeof(ffbuf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2200 &srchcnt,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2201 FIL_STANDARD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2202 if (rc != NO_ERROR)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2203 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2204 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	2205
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2206 /* 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	2207 #else
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2208 # 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	2209 #endif
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2210 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2211 #endif
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2212
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2213 /*
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2214 * 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	2215 * 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	2216 * possibly case-insensitive.
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2217 *
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2218 * 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	2219 * 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	2220 * if envar PYTHONCASEOK exists.
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2221 *
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2222 * 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	2223 * 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	2224 * 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	2225 * 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	2226 */
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2227
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2228 static int
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2229 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	2230 {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2231 #ifdef MS_WINDOWS
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2232 WIN32_FIND_DATAW data;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2233 HANDLE h;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2234 int cmp;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2235
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2236 if (Py_GETENV("PYTHONCASEOK") != NULL)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2237 return 1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2238
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2239 h = FindFirstFileW(PyUnicode_AS_UNICODE(filename), &data);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2240 if (h == INVALID_HANDLE_VALUE) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2241 PyErr_Format(PyExc_NameError,
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2242 "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	2243 name, filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2244 return 0;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2245 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2246 FindClose(h);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2247 cmp = wcsncmp(data.cFileName,
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2248 PyUnicode_AS_UNICODE(name),
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2249 PyUnicode_GET_SIZE(name));
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2250 return cmp == 0;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2251 #elif defined(USE_CASE_OK_BYTES)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2252 int match;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2253 PyObject filebytes, namebytes;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2254 filebytes = PyUnicode_EncodeFSDefault(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2255 if (filebytes == NULL)
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2256 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2257 namebytes = PyUnicode_EncodeFSDefault(name);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2258 if (namebytes == NULL) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2259 Py_DECREF(filebytes);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2260 return -1;
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 match = case_bytes(
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2263 PyBytes_AS_STRING(filebytes),
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2264 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	2265 PyBytes_GET_SIZE(namebytes),
f8d6f6797909 Issue #3080: Fix case_ok() using case_bytes() Victor Stinner <victor.stinner@haypocalc.com> parents: 68739 diff changeset	2266 PyBytes_AS_STRING(namebytes));
68734 066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2267 Py_DECREF(filebytes);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2268 Py_DECREF(namebytes);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2269 return match;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2270 #else
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2271 /* 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	2272 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	2273
16828 3b05212c1616 Implement PEP 235: Import on Case-Insensitive Platforms. Tim Peters <tim.peters@gmail.com> parents: 16712 diff changeset	2274 #endif
7305 067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	2275 }
067e4813c6d6 Added DJGPP version of check_case(), by Pit Scrorpion (Hans Nowak). Guido van Rossum <guido@python.org> parents: 7290 diff changeset	2276
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2277 #ifdef HAVE_STAT
63985 953010c0b168 Issue #9425: Create private _Py_stat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63945 diff changeset	2278
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2279 /* 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	2280 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	2281 static int
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2282 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	2283 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2284 struct stat statbuf;
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2285 PyObject *filename;
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2286 int match;
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2287
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2288 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	2289 if (filename == NULL)
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2290 return -1;
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2291 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	2292 /* 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	2293 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	2294 if (match < 0) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2295 Py_DECREF(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2296 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2297 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2298 if (match) {
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2299 Py_DECREF(filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2300 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2301 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2302 }
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2303 Py_DECREF(filename);
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2304
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2305 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	2306 directory, SEP, Py_OptimizeFlag ? 'o' : 'c');
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2307 if (filename == NULL)
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2308 return -1;
298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2309 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	2310 /* 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	2311 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	2312 if (match < 0) {
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2313 Py_DECREF(filename);
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2314 return -1;
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2315 }
066b399a8477 Issue #3080: case_ok() expects Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68733 diff changeset	2316 if (match) {
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2317 Py_DECREF(filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2318 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2319 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2320 }
68733 298a70b27497 Issue #3080: find_init_module() expects Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68732 diff changeset	2321 Py_DECREF(filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2322 return 0;
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2323 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16932 diff changeset	2324
6542 62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2325 #endif /* HAVE_STAT */
62bdb1cbe0f5 New policy for package imports: only a directory containing Guido van Rossum <guido@python.org> parents: 6541 diff changeset	2326
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1362 diff changeset	2327
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2328 static int init_builtin(PyObject ); / Forward */
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2329
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2330 static PyObject*
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2331 load_builtin(PyObject *name, int type)
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2332 {
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2333 PyObject m, modules;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2334 int err;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2335
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2336 if (type == C_BUILTIN)
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2337 err = init_builtin(name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2338 else
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2339 err = PyImport_ImportFrozenModuleObject(name);
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2340 if (err < 0)
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2341 return NULL;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2342 if (err == 0) {
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2343 PyErr_Format(PyExc_ImportError,
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2344 "Purported %s module %R not found",
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2345 type == C_BUILTIN ? "builtin" : "frozen",
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2346 name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2347 return NULL;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2348 }
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2349
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2350 modules = PyImport_GetModuleDict();
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2351 m = PyDict_GetItem(modules, name);
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2352 if (m == NULL) {
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2353 PyErr_Format(
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2354 PyExc_ImportError,
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2355 "%s module %R not properly initialized",
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2356 type == C_BUILTIN ? "builtin" : "frozen",
63857 10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2357 name);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2358 return NULL;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2359 }
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2360 Py_INCREF(m);
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2361 return m;
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2362 }
10c95c0f34d3 Issue #9425: Create load_builtin() subfunction Victor Stinner <victor.stinner@haypocalc.com> parents: 62570 diff changeset	2363
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2364 /* 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	2365 its module object WITH INCREMENTED REFERENCE COUNT */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	2366
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2367 static PyObject *
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2368 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	2369 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2370 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2371
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2372 /* 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	2373 switch (type) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2374 case PY_SOURCE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2375 case PY_COMPILED:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2376 if (fp == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2377 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	2378 "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	2379 type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2380 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2381 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2382 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2383
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2384 switch (type) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2385
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2386 case PY_SOURCE:
64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2387 m = load_source_module(name, pathname, fp);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2388 break;
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2389
64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2390 case PY_COMPILED:
64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2391 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	2392 break;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2393
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2394 #ifdef HAVE_DYNAMIC_LOADING
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2395 case C_EXTENSION:
64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2396 m = _PyImport_LoadDynamicModule(name, pathname, fp);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2397 break;
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	2398 #endif
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2399
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2400 case PKG_DIRECTORY:
64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2401 m = load_package(name, pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2402 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2403
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2404 case C_BUILTIN:
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2405 case PY_FROZEN:
64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2406 m = load_builtin(name, type);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2407 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2408
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2409 case IMP_HOOK: {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2410 if (loader == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2411 PyErr_SetString(PyExc_ImportError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2412 "import hook without loader");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2413 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2414 }
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	2415 m = PyObject_CallMethod(loader, "load_module", "O", name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2416 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2417 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2418
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2419 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2420 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	2421 "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	2422 name, type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2423 m = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2424
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2425 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2426
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2427 return m;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2428 }
40 f28ac7f621c7 Added reload() functionality. Guido van Rossum <guido@python.org> parents: 6 diff changeset	2429
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 74 diff changeset	2430
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2431 /* 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	2432 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	2433 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	2434
bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	2435 static int
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2436 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	2437 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2438 struct _inittab *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2439
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2440 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	2441 return 1;
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 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	2444 PyObject *mod;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2445 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	2446 if (p->initfunc == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2447 PyErr_Format(PyExc_ImportError,
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2448 "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	2449 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2450 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2451 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2452 if (Py_VerboseFlag)
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2453 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	2454 mod = (*p->initfunc)();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2455 if (mod == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2456 return -1;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	2457 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	2458 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2459 /* 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	2460 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	2461 Py_DECREF(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2462 return 1;
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 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2465 return 0;
141 bf5a8539d8ba Call the init function of a built-in module here. Guido van Rossum <guido@python.org> parents: 86 diff changeset	2466 }
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2467
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2468
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2469 /* 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	2470
3683 ec39264311ff struct frozen is now struct _frozen and comes from import.h. Guido van Rossum <guido@python.org> parents: 3590 diff changeset	2471 static struct _frozen *
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2472 find_frozen(PyObject *name)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2473 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2474 struct _frozen *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2475
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2476 if (name == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2477 return NULL;
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 for (p = PyImport_FrozenModules; ; p++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2480 if (p->name == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2481 return NULL;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2482 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	2483 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2484 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2485 return p;
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2486 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2487
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2488 static PyObject *
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2489 get_frozen_object(PyObject *name)
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2490 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2491 struct _frozen *p = find_frozen(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2492 int size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2493
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2494 if (p == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2495 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2496 "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	2497 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2498 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2499 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2500 if (p->code == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2501 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2502 "Excluded frozen object named %R",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2503 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2504 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2505 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2506 size = p->size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2507 if (size < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2508 size = -size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2509 return PyMarshal_ReadObjectFromString((char *)p->code, size);
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2510 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2511
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2512 static PyObject *
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2513 is_frozen_package(PyObject *name)
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2514 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2515 struct _frozen *p = find_frozen(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2516 int size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2517
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2518 if (p == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2519 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2520 "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	2521 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2522 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2523 }
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 size = p->size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2526
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2527 if (size < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2528 Py_RETURN_TRUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2529 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2530 Py_RETURN_FALSE;
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2531 }
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2532
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	2533
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2534 /* Initialize a frozen module.
52073 56983cfdf5d4 Fix a typo in a comment. Brett Cannon <bcannon@gmail.com> parents: 51996 diff changeset	2535 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	2536 an exception set if the initialization failed.
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	2537 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	2538
6263e2fd9398 init_frozen non-static, frozenmain.c not in Makefile any more Guido van Rossum <guido@python.org> parents: 2270 diff changeset	2539 int
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2540 PyImport_ImportFrozenModuleObject(PyObject *name)
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2541 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2542 struct _frozen *p;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2543 PyObject co, m, *path;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2544 int ispackage;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2545 int size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2546
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2547 p = find_frozen(name);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2548
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2549 if (p == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2550 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2551 if (p->code == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2552 PyErr_Format(PyExc_ImportError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2553 "Excluded frozen object named %R",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2554 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2555 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2556 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2557 size = p->size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2558 ispackage = (size < 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2559 if (ispackage)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2560 size = -size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2561 if (Py_VerboseFlag)
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2562 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	2563 name, ispackage ? " package" : "");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2564 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	2565 if (co == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2566 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2567 if (!PyCode_Check(co)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2568 PyErr_Format(PyExc_TypeError,
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2569 "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	2570 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2571 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2572 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2573 if (ispackage) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2574 /* Set __path__ to the package name */
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2575 PyObject d, l;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2576 int err;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2577 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2578 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2579 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2580 d = PyModule_GetDict(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2581 l = PyList_New(1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2582 if (l == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2583 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2584 }
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2585 Py_INCREF(name);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2586 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	2587 err = PyDict_SetItemString(d, "__path__", l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2588 Py_DECREF(l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2589 if (err != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2590 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2591 }
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2592 path = PyUnicode_FromString("<frozen>");
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2593 if (path == NULL)
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2594 goto err_return;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2595 m = PyImport_ExecCodeModuleObject(name, co, path, NULL);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2596 Py_DECREF(path);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2597 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2598 goto err_return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2599 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2600 Py_DECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2601 return 1;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2602 err_return:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2603 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2604 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	2605 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2606
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2607 int
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2608 PyImport_ImportFrozenModule(char *name)
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2609 {
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2610 PyObject *nameobj;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2611 int ret;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2612 nameobj = PyUnicode_InternFromString(name);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2613 if (nameobj == NULL)
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2614 return -1;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2615 ret = PyImport_ImportFrozenModuleObject(nameobj);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2616 Py_DECREF(nameobj);
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2617 return ret;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2618 }
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	2619
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2620
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	2621 /* 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	2622 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	2623
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2624 PyObject *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35757 diff changeset	2625 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	2626 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2627 PyObject *pname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2628 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2629
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2630 pname = PyUnicode_FromString(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2631 if (pname == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2632 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2633 result = PyImport_Import(pname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2634 Py_DECREF(pname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2635 return result;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2636 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2637
44441 b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2638 /* Import a module without blocking
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2639 *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2640 * 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	2641 * 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	2642 * 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	2643 * ImportError instead of blocking.
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2644 *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2645 * 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	2646 */
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2647 PyObject *
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2648 PyImport_ImportModuleNoBlock(const char *name)
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2649 {
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2650 PyObject nameobj, modules, *result;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2651 long me;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2652
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2653 /* 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	2654 modules = PyImport_GetModuleDict();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2655 if (modules == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2656 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2657
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2658 nameobj = PyUnicode_FromString(name);
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2659 if (nameobj == NULL)
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2660 return NULL;
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2661 result = PyDict_GetItem(modules, nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2662 if (result != NULL) {
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2663 Py_DECREF(nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2664 Py_INCREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2665 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2666 }
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2667 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	2668 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2669 /* check the import lock
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2670 * 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	2671 * takes care of the problem */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2672 me = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2673 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	2674 /* 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	2675 result = PyImport_Import(nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2676 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2677 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2678 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	2679 "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	2680 "is held by another thread.",
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2681 nameobj);
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2682 result = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2683 }
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	2684 #else
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2685 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	2686 #endif
68724 e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2687 Py_DECREF(nameobj);
e55e7f197649 Issue #3080: PyImport_ImportModuleNoBlock() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68723 diff changeset	2688 return result;
44441 b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2689 }
b91ca87e6f32 Merged revisions 59666-59679 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2690
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2691 /* 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	2692 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	2693 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	2694 int level);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13266 diff changeset	2695 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	2696 PyObject inputname, PyObject *p_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	2697 Py_UNICODE buf, Py_ssize_t p_buflen,
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2698 Py_ssize_t bufsize);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2699 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	2700 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	2701 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	2702 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	2703 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	2704
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	2705 /* 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	2706
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	2707 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	2708 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	2709 PyObject *fromlist, int level)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	2710 {
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	2711 Py_UNICODE buf[MAXPATHLEN+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	2712 Py_ssize_t buflen;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2713 Py_ssize_t bufsize = MAXPATHLEN+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	2714 PyObject parent, head, next, tail, 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	2715 PyObject parent_name, ensure_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	2716 const Py_UNICODE *nameunicode;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2717
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2718 nameunicode = PyUnicode_AS_UNICODE(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	2719
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2720 if (Py_UNICODE_strchr(nameunicode, SEP) != 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	2721 #ifdef ALTSEP
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2722 \|\| Py_UNICODE_strchr(nameunicode, ALTSEP) != NULL
44617 a29adc3b0f26 Merged revisions 59864-59882 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	2723 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2724 ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2725 PyErr_SetString(PyExc_ImportError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2726 "Import by filename is not supported.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2727 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2728 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2729
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	2730 parent = get_parent(globals, &parent_name, level);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2731 if (parent == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2732 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2733
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	2734 buflen = PyUnicode_GET_SIZE(parent_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	2735 if (buflen+1 > bufsize) {
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2736 Py_DECREF(parent_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	2737 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	2738 "Module name too long");
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2739 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	2740 }
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2741 Py_UNICODE_strcpy(buf, PyUnicode_AS_UNICODE(parent_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	2742 Py_DECREF(parent_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	2743
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2744 head = load_next(parent, level < 0 ? Py_None : parent, name, &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	2745 buf, &buflen, bufsize);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2746 if (head == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2747 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2748
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2749 tail = head;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2750 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	2751
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2752 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	2753 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	2754 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	2755 next = load_next(tail, tail, 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	2756 buf, &buflen, bufsize);
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 Py_DECREF(tail);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2758 Py_DECREF(inputname);
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 if (next == 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	2760 Py_DECREF(head);
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 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	2762 }
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 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	2764
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 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	2766 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	2767 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2768 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2769 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2770 if (tail == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2771 /* 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	2772 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	2773 doctored faulty bytecode */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2774 Py_DECREF(tail);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2775 Py_DECREF(head);
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	2776 PyErr_SetString(PyExc_ValueError, "Empty module name");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2777 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2778 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2779
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2780 if (fromlist != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2781 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	2782 fromlist = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2783 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2784
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2785 if (fromlist == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2786 Py_DECREF(tail);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2787 return head;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2788 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2789
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2790 Py_DECREF(head);
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	2791
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2792 ensure_name = PyUnicode_FromUnicode(buf, Py_UNICODE_strlen(buf));
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2793 if (ensure_name == NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2794 Py_DECREF(tail);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2795 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2796 }
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	2797 if (!ensure_fromlist(tail, fromlist, ensure_name, 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	2798 Py_DECREF(tail);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2799 Py_DECREF(ensure_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	2800 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	2801 }
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2802 Py_DECREF(ensure_name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2803
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2804 return tail;
6249 f10aad73e029 Phase two of package import. "import a.b.c" and all variants now do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	2805 }
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	2806
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2807 PyObject *
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2808 PyImport_ImportModuleLevelObject(PyObject name, PyObject globals,
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2809 PyObject locals, PyObject fromlist,
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2810 int level)
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2811 {
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2812 PyObject *mod;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2813 _PyImport_AcquireLock();
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2814 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	2815 if (_PyImport_ReleaseLock() < 0) {
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2816 Py_XDECREF(mod);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2817 PyErr_SetString(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2818 "not holding the import lock");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2819 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2820 }
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2821 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	2822 }
ea8184bff12d Add a single Python-wide (!) lock on import. Only one thread at a Guido van Rossum <guido@python.org> parents: 7403 diff changeset	2823
68739 80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2824 PyObject *
70374 a9126e8770e5 make PyImport_ImportModuleLevel's first arg const like similiar functions (closes #12173) Benjamin Peterson <benjamin@python.org> parents: 69463 diff changeset	2825 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	2826 PyObject *fromlist, int level)
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2827 {
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2828 PyObject nameobj, mod;
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2829 nameobj = PyUnicode_FromString(name);
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2830 if (nameobj == NULL)
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2831 return NULL;
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2832 mod = PyImport_ImportModuleLevelObject(nameobj, globals, locals,
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2833 fromlist, level);
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2834 Py_DECREF(nameobj);
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2835 return mod;
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2836 }
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2837
80f4bd647695 Issue #3080: Add PyImport_ImportModuleLevelObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68738 diff changeset	2838
32156 56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2839 /* 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	2840 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	2841 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	2842 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	2843
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	2844 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	2845
56a4ec066621 starting to add comments to explain what's here Fred Drake <fdrake@acm.org> parents: 31851 diff changeset	2846 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	2847 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	2848 */
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	2849 static PyObject *
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	2850 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	2851 {
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	2852 Py_UNICODE name[MAXPATHLEN+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	2853 const Py_ssize_t bufsize = MAXPATHLEN+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	2854 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	2855
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2856 static PyObject *namestr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2857 static PyObject *pathstr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2858 static PyObject *pkgstr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2859 PyObject pkgname, modname, modpath, modules, *parent;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2860 int orig_level = level;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2861
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2862 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	2863 goto return_none;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2864
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2865 if (namestr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2866 namestr = PyUnicode_InternFromString("__name__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2867 if (namestr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2868 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2869 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2870 if (pathstr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2871 pathstr = PyUnicode_InternFromString("__path__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2872 if (pathstr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2873 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2874 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2875 if (pkgstr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2876 pkgstr = PyUnicode_InternFromString("__package__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2877 if (pkgstr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2878 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2879 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2880
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2881 pkgname = PyDict_GetItem(globals, pkgstr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2882
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2883 if ((pkgname != NULL) && (pkgname != Py_None)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2884 /* __package__ is set, so use it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2885 if (!PyUnicode_Check(pkgname)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2886 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2887 "__package__ set to non-string");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2888 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2889 }
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	2890 if (PyUnicode_GET_SIZE(pkgname) == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2891 if (level > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2892 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2893 "Attempted relative import in non-package");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2894 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2895 }
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	2896 goto return_none;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2897 }
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	2898 if (PyUnicode_GET_SIZE(pkgname)+1 > bufsize) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2899 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2900 "Package name too long");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2901 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2902 }
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	2903 Py_UNICODE_strcpy(name, PyUnicode_AS_UNICODE(pkgname));
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2904 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2905 /* __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	2906 modname = PyDict_GetItem(globals, namestr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2907 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	2908 goto return_none;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2909
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2910 modpath = PyDict_GetItem(globals, pathstr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2911 if (modpath != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2912 /* __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	2913 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2914
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	2915 if (PyUnicode_GET_SIZE(modname)+1 > bufsize) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2916 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2917 "Module name too long");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2918 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2919 }
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	2920 Py_UNICODE_strcpy(name, PyUnicode_AS_UNICODE(modname));
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2921 error = PyDict_SetItem(globals, pkgstr, modname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2922 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2923 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2924 "Could not set __package__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2925 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2926 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2927 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2928 /* 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	2929 Py_UNICODE *start = PyUnicode_AS_UNICODE(modname);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2930 Py_UNICODE *lastdot = Py_UNICODE_strrchr(start, '.');
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2931 Py_ssize_t len;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2932 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2933 if (lastdot == NULL && level > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2934 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2935 "Attempted relative import in non-package");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2936 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2937 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2938 if (lastdot == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2939 error = PyDict_SetItem(globals, pkgstr, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2940 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2941 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2942 "Could not set __package__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2943 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2944 }
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	2945 goto return_none;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2946 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2947 len = lastdot - start;
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	2948 if (len+1 > bufsize) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2949 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2950 "Module name too long");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2951 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2952 }
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	2953 Py_UNICODE_strncpy(name, start, len);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2954 name[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	2955 pkgname = PyUnicode_FromUnicode(name, len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2956 if (pkgname == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2957 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2958 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2959 error = PyDict_SetItem(globals, pkgstr, pkgname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2960 Py_DECREF(pkgname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2961 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2962 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2963 "Could not set __package__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2964 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2965 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2966 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2967 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2968 while (--level > 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	2969 Py_UNICODE *dot = Py_UNICODE_strrchr(name, '.');
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2970 if (dot == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2971 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2972 "Attempted relative import beyond "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2973 "toplevel package");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2974 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2975 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2976 *dot = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2977 }
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	2978
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2979 nameobj = PyUnicode_FromUnicode(name, Py_UNICODE_strlen(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	2980 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	2981 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2982
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2983 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	2984 parent = PyDict_GetItem(modules, nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2985 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	2986 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	2987
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2988 if (orig_level >= 1) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2989 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	2990 "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	2991 "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	2992 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	2993 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	2994 }
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	2995
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	2996 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	2997 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	2998 "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	2999 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	3000 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	3001 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	3002 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	3003
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3004 goto return_none;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3005 }
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	3006 *p_name = nameobj;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3007 return parent;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3008 /* 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	3009 - parent.__name__ == name
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3010 - parent.__dict__ is globals
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3011 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	3012
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3013 return_none:
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3014 nameobj = PyUnicode_FromUnicode(NULL, 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	3015 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	3016 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	3017 *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	3018 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	3019 }
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	3020
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3021 /* 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	3022 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	3023 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	3024 PyObject inputname, PyObject *p_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	3025 Py_UNICODE buf, Py_ssize_t p_buflen, Py_ssize_t bufsize)
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	3026 {
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	3027 const Py_UNICODE *dot;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3028 Py_ssize_t len;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3029 Py_UNICODE *p;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3030 PyObject fullname, name, result, mark_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	3031 const Py_UNICODE *nameuni;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3032
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 *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	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 (PyUnicode_GET_SIZE(inputname) == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3036 /* 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	3037 'from . import' (or '__import__("")')*/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3038 Py_INCREF(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3039 return mod;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3040 }
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 nameuni = PyUnicode_AS_UNICODE(inputname);
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 if (nameuni == 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	3044 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	3045
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 dot = Py_UNICODE_strchr(nameuni, '.');
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 if (dot != 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	3048 len = dot - nameuni;
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 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	3050 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	3051 "Empty module 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	3052 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	3053 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3054 }
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	3055 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	3056 len = PyUnicode_GET_SIZE(inputname);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3057
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3058 if (*p_buflen+len+1 >= bufsize) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3059 PyErr_SetString(PyExc_ValueError,
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	3060 "Module name too long");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3061 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3062 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3063
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3064 p = buf + *p_buflen;
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	3065 if (p != buf) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3066 *p++ = '.';
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	3067 *p_buflen += 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	3068 }
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3069 Py_UNICODE_strncpy(p, nameuni, len);
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 p[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	3071 *p_buflen += len;
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3072
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3073 fullname = PyUnicode_FromUnicode(buf, *p_buflen);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3074 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	3075 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	3076 name = PyUnicode_FromUnicode(p, len);
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 if (name == 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	3078 Py_DECREF(fullname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3079 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3080 }
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	3081 result = import_submodule(mod, name, 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	3082 Py_DECREF(fullname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3083 if (result == Py_None && altmod != mod) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3084 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3085 /* 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	3086 result = import_submodule(altmod, name, 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	3087 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3088 if (result != NULL && result != Py_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	3089 mark_name = PyUnicode_FromUnicode(buf, *p_buflen);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3090 if (mark_name == NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3091 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3092 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3093 }
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	3094 if (mark_miss(mark_name) != 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	3095 Py_DECREF(result);
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 Py_DECREF(mark_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	3097 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	3098 }
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3099 Py_DECREF(mark_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	3100 Py_UNICODE_strncpy(buf, nameuni, len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3101 buf[len] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3102 *p_buflen = len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3103 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3104 }
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	3105 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	3106 Py_DECREF(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3107 if (result == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3108 return NULL;
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 if (result == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3111 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3112 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	3113 "No module named %R", inputname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3114 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3115 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3116
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	3117 if (dot != 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	3118 *p_outputname = PyUnicode_FromUnicode(dot+1, Py_UNICODE_strlen(dot+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	3119 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	3120 Py_DECREF(result);
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3121 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	3122 }
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3123 }
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3124
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3125 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	3126 }
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	3127
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	3128 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	3129 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	3130 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3131 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	3132 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	3133 }
6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	3134
6429db5d0af7 Significant speedup -- when a submodule imports a global module, add a Guido van Rossum <guido@python.org> parents: 6250 diff changeset	3135 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	3136 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	3137 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	3138 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3139 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	3140 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	3141 Py_ssize_t fromlist_len;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3142
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3143 if (!PyObject_HasAttrString(mod, "__path__"))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3144 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3145
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 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	3147
7c67aa3ab531 Issue #3080: Use Unicode for the "The Magnum Opus of dotted-name import" Victor Stinner <victor.stinner@haypocalc.com> parents: 68724 diff changeset	3148 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	3149 PyObject *item = PySequence_GetItem(fromlist, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3150 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	3151 if (item == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3152 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3153 if (!PyUnicode_Check(item)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3154 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3155 "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	3156 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3157 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3158 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3159 if (PyUnicode_AS_UNICODE(item)[0] == '*') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3160 PyObject *all;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3161 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3162 /* See if the package defines __all__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3163 if (recursive)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3164 continue; /* Avoid endless recursion */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3165 all = PyObject_GetAttrString(mod, "__all__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3166 if (all == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3167 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3168 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	3169 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	3170 Py_DECREF(all);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3171 if (!ret)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3172 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3173 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3174 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3175 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3176 hasit = PyObject_HasAttr(mod, item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3177 if (!hasit) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3178 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	3179 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	3180 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	3181 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	3182 Py_DECREF(fullname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3183 }
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	3184 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	3185 submod = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3186 Py_XDECREF(submod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3187 if (submod == NULL) {
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 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3191 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3192 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3193 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3194
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	3195 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	3196 }
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	3197
29501 6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	3198 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	3199 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	3200 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	3201 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3202 if (mod == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3203 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3204 /* 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	3205 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	3206 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	3207 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	3208 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	3209 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	3210 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	3211 submod = PyDict_GetItem(modules, fullname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3212 if (submod == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3213 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3214 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3215 if (PyModule_Check(mod)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3216 /* 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	3217 * 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	3218 * builtin name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3219 PyObject *dict = PyModule_GetDict(mod);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3220 if (!dict)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3221 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	3222 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	3223 return 0;
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 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	3226 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	3227 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3228 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3229 return 1;
29501 6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	3230 }
6c6b321d1d10 Don't use the module object setattr when importing submodules. Instead, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28392 diff changeset	3231
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	3232 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	3233 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	3234 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3235 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	3236 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	3237 struct filedescr *fdp;
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3238 FILE *fp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3239
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3240 /* Require:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3241 if mod == None: subname == fullname
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3242 else: mod.__name__ + "." + subname == fullname
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3243 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3244
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	3245 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	3246 Py_INCREF(m);
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3247 return m;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3248 }
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3249
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3250 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	3251 path_list = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3252 else {
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3253 path_list = PyObject_GetAttrString(mod, "__path__");
fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3254 if (path_list == NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3255 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3256 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3257 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3258 }
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3259 }
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3260
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3261 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	3262 &bufobj, &fp, &loader);
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3263 Py_XDECREF(path_list);
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3264 if (fdp == NULL) {
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3265 if (!PyErr_ExceptionMatches(PyExc_ImportError))
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3266 return NULL;
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3267 PyErr_Clear();
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3268 Py_INCREF(Py_None);
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3269 return Py_None;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3270 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3271 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	3272 Py_XDECREF(bufobj);
68727 2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3273 Py_XDECREF(loader);
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3274 if (fp)
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3275 fclose(fp);
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3276 if (m == NULL)
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3277 return NULL;
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3278 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	3279 Py_XDECREF(m);
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3280 return NULL;
2ee0ab9d2e8a Issue #3080: Reindent and simplify import_submodule() Victor Stinner <victor.stinner@haypocalc.com> parents: 68726 diff changeset	3281 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3282 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	3283 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3284
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3285
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3286 /* 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	3287 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	3288
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3289 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3290 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	3291 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3292 PyInterpreterState *interp = PyThreadState_Get()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3293 PyObject *modules_reloading = interp->modules_reloading;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3294 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	3295 PyObject path_list = NULL, loader = NULL, *existing_m = NULL;
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3296 PyObject nameobj, bufobj, *subnameobj;
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3297 Py_UNICODE name, subname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3298 struct filedescr *fdp;
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3299 FILE *fp = NULL;
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3300 PyObject *newm = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3301
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3302 if (modules_reloading == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3303 Py_FatalError("PyImport_ReloadModule: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3304 "no modules_reloading dictionary!");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3305 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3306 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3307
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3308 if (m == NULL \|\| !PyModule_Check(m)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3309 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3310 "reload() argument must be module");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3311 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3312 }
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3313 nameobj = PyModule_GetNameObject(m);
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3314 if (nameobj == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3315 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	3316 if (m != PyDict_GetItem(modules, nameobj)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3317 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	3318 "reload(): module %R not in sys.modules",
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3319 nameobj);
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3320 Py_DECREF(nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3321 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3322 }
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3323 existing_m = PyDict_GetItem(modules_reloading, nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3324 if (existing_m != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3325 /* 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	3326 being reloaded. */
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3327 Py_DECREF(nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3328 Py_INCREF(existing_m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3329 return existing_m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3330 }
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3331 if (PyDict_SetItem(modules_reloading, nameobj, m) < 0) {
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3332 Py_DECREF(nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3333 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	3334 }
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3335
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3336 name = PyUnicode_AS_UNICODE(nameobj);
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3337 subname = Py_UNICODE_strrchr(name, '.');
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3338 if (subname == NULL) {
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3339 Py_INCREF(nameobj);
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3340 subnameobj = nameobj;
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3341 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3342 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3343 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	3344 Py_ssize_t len;
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3345 len = subname - name;
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3346 parentname = PyUnicode_FromUnicode(name, len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3347 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	3348 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3349 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3350 parent = PyDict_GetItem(modules, parentname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3351 if (parent == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3352 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	3353 "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	3354 parentname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3355 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	3356 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3357 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3358 Py_DECREF(parentname);
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3359 path_list = PyObject_GetAttrString(parent, "__path__");
fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3360 if (path_list == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3361 PyErr_Clear();
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3362 subname++;
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3363 len = PyUnicode_GET_SIZE(nameobj) - (len + 1);
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3364 subnameobj = PyUnicode_FromUnicode(subname, len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3365 }
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3366 if (subnameobj == NULL)
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3367 goto error;
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3368 fdp = find_module(nameobj, subnameobj, path_list,
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3369 &bufobj, &fp, &loader);
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3370 Py_DECREF(subnameobj);
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3371 Py_XDECREF(path_list);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3372
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3373 if (fdp == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3374 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	3375 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3376 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3377
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3378 newm = load_module(nameobj, 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	3379 Py_XDECREF(bufobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3380 Py_XDECREF(loader);
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 if (fp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3383 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3384 if (newm == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3385 /* 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	3386 * 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	3387 * 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	3388 * 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	3389 */
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3390 PyDict_SetItem(modules, nameobj, m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3391 }
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3392
156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3393 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3394 imp_modules_reloading_clear();
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3395 Py_DECREF(nameobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3396 return newm;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3397 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3398
d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3399
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3400 /* 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	3401 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	3402 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	3403 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	3404 environment.
9680 8b61e1273b4b Improve comment for PyImport_Import() as suggested by Bill Tutt. Guido van Rossum <guido@python.org> parents: 9679 diff changeset	3405 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	3406 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	3407 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	3408
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3409 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3410 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	3411 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3412 static PyObject *silly_list = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3413 static PyObject *builtins_str = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3414 static PyObject *import_str = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3415 PyObject *globals = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3416 PyObject *import = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3417 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	3418 PyObject *modules = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3419 PyObject *r = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3420
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3421 /* Initialize constant string objects */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3422 if (silly_list == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3423 import_str = PyUnicode_InternFromString("__import__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3424 if (import_str == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3425 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3426 builtins_str = PyUnicode_InternFromString("__builtins__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3427 if (builtins_str == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3428 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	3429 silly_list = PyList_New(0);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3430 if (silly_list == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3431 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3432 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3433
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3434 /* Get the builtins from current globals */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3435 globals = PyEval_GetGlobals();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3436 if (globals != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3437 Py_INCREF(globals);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3438 builtins = PyObject_GetItem(globals, builtins_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3439 if (builtins == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3440 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3441 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3442 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3443 /* 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	3444 builtins = PyImport_ImportModuleLevel("builtins",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3445 NULL, NULL, NULL, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3446 if (builtins == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3447 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3448 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	3449 if (globals == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3450 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3451 }
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 /* 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	3454 if (PyDict_Check(builtins)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3455 import = PyObject_GetItem(builtins, import_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3456 if (import == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3457 PyErr_SetObject(PyExc_KeyError, import_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3458 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3459 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3460 import = PyObject_GetAttr(builtins, import_str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3461 if (import == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3462 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3463
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3464 /* 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	3465 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	3466 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	3467 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	3468 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	3469 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	3470 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	3471 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	3472
dd3080b80dda PyImport_Import was using the old import hack of sticking a dummy value into Brett Cannon <bcannon@gmail.com> parents: 64638 diff changeset	3473 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	3474 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	3475 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	3476 Py_INCREF(r);
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3477
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3478 err:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3479 Py_XDECREF(globals);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3480 Py_XDECREF(builtins);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3481 Py_XDECREF(import);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3482
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3483 return r;
6028 292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3484 }
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3485
292193170da1 Added Jim Fulton's PyImport_Import(), which calls whatever Guido van Rossum <guido@python.org> parents: 5980 diff changeset	3486
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3487 /* 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	3488 importing modules.
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3489 */
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3490
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3491 static PyObject *
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3492 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	3493 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3494 char buf[4];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3495
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3496 buf[0] = (char) ((magic >> 0) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3497 buf[1] = (char) ((magic >> 8) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3498 buf[2] = (char) ((magic >> 16) & 0xff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3499 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	3500
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3501 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	3502 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3503
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3504 static PyObject *
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3505 imp_get_magic(PyObject self, PyObject noargs)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3506 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3507 return imp_make_magic(pyc_magic);
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3508 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3509
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3510 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3511 imp_get_tag(PyObject self, PyObject noargs)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3512 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3513 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	3514 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3515
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3516 static PyObject *
27917 c346d095791d Remove PyArg_ParseTuple() for methods which take no args, Neal Norwitz <nnorwitz@gmail.com> parents: 27853 diff changeset	3517 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	3518 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3519 PyObject *list;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3520 struct filedescr *fdp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3521
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3522 list = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3523 if (list == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3524 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3525 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	3526 PyObject *item = Py_BuildValue("ssi",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3527 fdp->suffix, fdp->mode, fdp->type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3528 if (item == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3529 Py_DECREF(list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3530 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3531 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3532 if (PyList_Append(list, item) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3533 Py_DECREF(list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3534 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3535 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3536 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3537 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3538 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3539 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	3540 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3541
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3542 static PyObject *
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3543 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	3544 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3545 extern int fclose(FILE *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3546 PyObject fob, ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3547 PyObject *pathobj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3548 struct filedescr *fdp;
68717 d52f471fbbeb Issue #3080: find_module() initialize buf and p_fp Victor Stinner <victor.stinner@haypocalc.com>* parents: 68716 diff changeset	3549 FILE *fp;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3550 int fd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3551 char *found_encoding = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3552 char *encoding = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3553
68730 fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3554 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	3555 path_list = NULL;
fe1d421ca3fa Issue #3080: Rename some path variables to path_list Victor Stinner <victor.stinner@haypocalc.com> parents: 68729 diff changeset	3556 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	3557 &pathobj, &fp, NULL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3558 if (fdp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3559 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3560 if (fp != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3561 fd = fileno(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3562 if (fd != -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3563 fd = dup(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3564 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3565 fp = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3566 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3567 if (fd != -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3568 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	3569 /* 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	3570 memory. */
69148 7b8d625eb6e4 Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error. Victor Stinner <victor.stinner@haypocalc.com> parents: 68887 diff changeset	3571 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	3572 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	3573 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	3574 Py_XDECREF(pathobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3575 return NULL;
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3576 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3577 encoding = (found_encoding != NULL) ? found_encoding :
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3578 (char*)PyUnicode_GetDefaultEncoding();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3579 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3580 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	3581 (char*)encoding, NULL, NULL, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3582 if (fob == NULL) {
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3583 Py_XDECREF(pathobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3584 close(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3585 PyMem_FREE(found_encoding);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3586 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3587 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3588 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3589 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3590 fob = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3591 Py_INCREF(fob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3592 }
68735 9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3593 if (pathobj == NULL) {
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3594 Py_INCREF(Py_None);
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3595 pathobj = Py_None;
9aec6f0e4076 Issue #3080: find_module() returns the path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68734 diff changeset	3596 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3597 ret = Py_BuildValue("NN(ssi)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3598 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	3599 PyMem_FREE(found_encoding);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3600
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3601 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3602 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3603
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3604 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3605 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	3606 {
68729 156818529636 Issue #3080: find_module() expects module fullname and subname as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68728 diff changeset	3607 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	3608 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	3609 &name, &path_list))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3610 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	3611 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	3612 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3613
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3614 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3615 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	3616 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	3617 PyObject *name;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3618 int ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3619 PyObject *m;
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	3620 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	3621 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3622 ret = init_builtin(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3623 if (ret < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3624 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3625 if (ret == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3626 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3627 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3628 }
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	3629 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3630 Py_XINCREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3631 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	3632 }
1844 d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3633
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3634 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3635 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	3636 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3637 PyObject *name;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3638 int ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3639 PyObject *m;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3640 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	3641 return NULL;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3642 ret = PyImport_ImportFrozenModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3643 if (ret < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3644 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3645 if (ret == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3646 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3647 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3648 }
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3649 m = PyImport_AddModuleObject(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3650 Py_XINCREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3651 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	3652 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3653
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3654 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3655 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	3656 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3657 PyObject *name;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3658
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3659 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	3660 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3661 return get_frozen_object(name);
2891 964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	3662 }
964d76f49a5e add imp.get_frozen_object() Guido van Rossum <guido@python.org> parents: 2868 diff changeset	3663
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3664 static PyObject *
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3665 imp_is_frozen_package(PyObject self, PyObject args)
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3666 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3667 PyObject *name;
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3668
e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3669 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	3670 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3671 return is_frozen_package(name);
52168 70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3672 }
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3673
70f5f9113ae1 Implement InspectLoader for FrozenImporter. Brett Cannon <bcannon@gmail.com> parents: 52073 diff changeset	3674 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3675 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	3676 {
68712 2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	3677 PyObject *name;
2425717c6430 Issue #3080: Import builtins using Unicode strings Victor Stinner <victor.stinner@haypocalc.com> parents: 68711 diff changeset	3678 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	3679 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3680 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	3681 }
d1e6c9a64a56 * Python/import.c: support .o/.so as alternative for Guido van Rossum <guido@python.org> parents: 1415 diff changeset	3682
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3683 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3684 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	3685 {
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3686 PyObject *name;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3687 struct _frozen *p;
68711 e7c1019b27b9 Issue #3080: Add PyImport_ImportFrozenModuleObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 68710 diff changeset	3688 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	3689 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3690 p = find_frozen(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3691 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	3692 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3693
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3694 static FILE *
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3695 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	3696 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3697 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3698 if (mode[0] == 'U')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3699 mode = "r" PY_STDIOTEXTMODE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3700 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	3701 fp = _Py_fopen(pathname, mode);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3702 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3703 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3704 int fd = PyObject_AsFileDescriptor(fob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3705 if (fd == -1)
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 if (!_PyVerify_fd(fd))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3708 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3709 /* 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	3710 * independently of the file descriptor given
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3711 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3712 fd = dup(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3713 if (fd == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3714 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3715 fp = fdopen(fd, mode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3716 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3717 if (fp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3718 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	3719 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3720 PyErr_SetFromErrno(PyExc_IOError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3721 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	3722 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3723
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3724 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3725 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	3726 {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3727 PyObject name, pathname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3728 PyObject *fob = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3729 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3730 FILE *fp;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3731 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	3732 &name,
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3733 PyUnicode_FSDecoder, &pathname,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3734 &fob))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3735 return NULL;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3736 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	3737 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	3738 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3739 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3740 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3741 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	3742 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	3743 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3744 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	3745 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3746
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3747 #ifdef HAVE_DYNAMIC_LOADING
528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3748
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3749 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3750 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	3751 {
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3752 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	3753 FILE *fp;
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3754
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3755 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	3756 &name, PyUnicode_FSDecoder, &pathname, &fob))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3757 return NULL;
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3758 if (fob != NULL) {
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3759 fp = get_file(NULL, fob, "r");
68826 3114f26d5d54 Issue #11630, issue #3080: Fix refleak introduced by ef2b6305d395 Victor Stinner <victor.stinner@haypocalc.com> parents: 68823 diff changeset	3760 if (fp == NULL) {
3114f26d5d54 Issue #11630, issue #3080: Fix refleak introduced by ef2b6305d395 Victor Stinner <victor.stinner@haypocalc.com> parents: 68823 diff changeset	3761 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3762 return NULL;
68826 3114f26d5d54 Issue #11630, issue #3080: Fix refleak introduced by ef2b6305d395 Victor Stinner <victor.stinner@haypocalc.com> parents: 68823 diff changeset	3763 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3764 }
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3765 else
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3766 fp = NULL;
ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3767 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	3768 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3769 if (fp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3770 fclose(fp);
68716 ef2b6305d395 Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Victor Stinner <victor.stinner@haypocalc.com> parents: 68715 diff changeset	3771 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	3772 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3773
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3774 #endif /* HAVE_DYNAMIC_LOADING */
528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	3775
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3776 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3777 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	3778 {
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3779 PyObject name, pathname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3780 PyObject *fob = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3781 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3782 FILE *fp;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3783 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	3784 &name,
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3785 PyUnicode_FSDecoder, &pathname,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3786 &fob))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3787 return NULL;
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3788 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	3789 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	3790 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3791 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3792 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3793 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	3794 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3795 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3796 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	3797 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3798
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3799 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3800 imp_load_module(PyObject self, PyObject args)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3801 {
68768 7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3802 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	3803 char suffix; / Unused */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3804 char *mode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3805 int type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3806 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3807
68768 7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3808 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	3809 &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	3810 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	3811 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	3812 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	3813 return NULL;
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3814 }
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3815 else
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3816 pathname = NULL;
7f4a4e393058 Issue #3080: imp.load_module() accepts None for the module path Victor Stinner <victor.stinner@haypocalc.com> parents: 68742 diff changeset	3817
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3818 if (*mode) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3819 /* 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	3820 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	3821 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	3822
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3823 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	3824 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3825 "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	3826 Py_XDECREF(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 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3829 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3830 if (fob == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3831 fp = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3832 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3833 fp = get_file(NULL, fob, mode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3834 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	3835 Py_XDECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3836 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3837 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3838 }
68723 64c21f364519 Issue #3080: load_module() expects name and path as Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68722 diff changeset	3839 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	3840 Py_XDECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3841 if (fp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3842 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3843 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3844 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3845
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3846 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3847 imp_load_package(PyObject self, PyObject args)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3848 {
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3849 PyObject name, pathname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3850 PyObject * ret;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3851 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	3852 &name, PyUnicode_FSDecoder, &pathname))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3853 return NULL;
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3854 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	3855 Py_DECREF(pathname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3856 return ret;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3857 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3858
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	3859 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	3860 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	3861 {
68736 c17bc2026145 Issue #3080: imp.new_module() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68735 diff changeset	3862 PyObject *name;
c17bc2026145 Issue #3080: imp.new_module() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68735 diff changeset	3863 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	3864 return NULL;
68736 c17bc2026145 Issue #3080: imp.new_module() uses Unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 68735 diff changeset	3865 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	3866 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	3867
44567 cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3868 static PyObject *
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3869 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	3870 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	3871 return PyImport_ReloadModule(v);
44567 cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3872 }
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3873
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3874 PyDoc_STRVAR(doc_reload,
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3875 "reload(module) -> module\n\
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3876 \n\
cdc285bd0efb Issue #1762972: Readded the reload() function as imp.reload() Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	3877 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	3878
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3879 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3880 imp_cache_from_source(PyObject self, PyObject args, PyObject *kws)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3881 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3882 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	3883
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3884 PyObject pathname, cpathname;
65391 f98c3e2fd055 fix refleak Benjamin Peterson <benjamin@python.org> parents: 65383 diff changeset	3885 PyObject *debug_override = NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3886 int debug = !Py_OptimizeFlag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3887
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3888 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	3889 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	3890 PyUnicode_FSDecoder, &pathname, &debug_override))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3891 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3892
65391 f98c3e2fd055 fix refleak Benjamin Peterson <benjamin@python.org> parents: 65383 diff changeset	3893 if (debug_override != NULL &&
f98c3e2fd055 fix refleak Benjamin Peterson <benjamin@python.org> parents: 65383 diff changeset	3894 (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	3895 Py_DECREF(pathname);
65391 f98c3e2fd055 fix refleak Benjamin Peterson <benjamin@python.org> parents: 65383 diff changeset	3896 return NULL;
f98c3e2fd055 fix refleak Benjamin Peterson <benjamin@python.org> parents: 65383 diff changeset	3897 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3898
65380 844ed6dddc03 imp.cache_from_source() uses PyUnicode_FSConverter() to support surrogates in Victor Stinner <victor.stinner@haypocalc.com> parents: 65349 diff changeset	3899 cpathname = make_compiled_pathname(
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3900 PyUnicode_AS_UNICODE(pathname),
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3901 debug);
d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3902 Py_DECREF(pathname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3903
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3904 if (cpathname == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3905 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	3906 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3907 }
68722 d24decc8c97e Issue #3080: Use Unicode to import source and compiled modules Victor Stinner <victor.stinner@haypocalc.com> parents: 68721 diff changeset	3908 return cpathname;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3909 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3910
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3911 PyDoc_STRVAR(doc_cache_from_source,
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3912 "Given the path to a .py file, return the path to its .pyc/.pyo file.\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3913 \n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3914 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	3915 .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	3916 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	3917 \n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3918 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	3919 the value of __debug__ instead.");
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3920
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3921 static PyObject *
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3922 imp_source_from_cache(PyObject self, PyObject args, PyObject *kws)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3923 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3924 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	3925 PyObject pathname, source;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3926
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3927 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	3928 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	3929 PyUnicode_FSDecoder, &pathname))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3930 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3931
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3932 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	3933 if (source == NULL) {
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3934 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	3935 pathname);
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3936 Py_DECREF(pathname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3937 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	3938 }
68721 f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3939 Py_DECREF(pathname);
f6507eb8e689 Issue #3080: get_sourcefile(), make_source_pathname(), load_package() Victor Stinner <victor.stinner@haypocalc.com> parents: 68720 diff changeset	3940 return source;
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3941 }
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3942
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3943 PyDoc_STRVAR(doc_source_from_cache,
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3944 "Given the path to a .pyc./.pyo file, return the path to its .py file.\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3945 \n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3946 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	3947 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	3948 does not conform to PEP 3147 format, ValueError will be raised.");
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3949
6305 6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3950 /* Doc strings */
6e1fa76e7940 Added docstrings. Not for the obsolete functions though. Guido van Rossum <guido@python.org> parents: 6304 diff changeset	3951
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3952 PyDoc_STRVAR(doc_imp,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3953 "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	3954 __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	3955
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3956 PyDoc_STRVAR(doc_find_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3957 "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	3958 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	3959 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	3960 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	3961 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	3962
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3963 PyDoc_STRVAR(doc_load_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3964 "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	3965 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	3966 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	3967
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3968 PyDoc_STRVAR(doc_get_magic,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3969 "get_magic() -> string\n\
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3970 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	3971
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3972 PyDoc_STRVAR(doc_get_tag,
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3973 "get_tag() -> string\n\
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3974 Return the magic tag for .pyc or .pyo files.");
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 60022 diff changeset	3975
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3976 PyDoc_STRVAR(doc_get_suffixes,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3977 "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	3978 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	3979 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	3980
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3981 PyDoc_STRVAR(doc_new_module,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3982 "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	3983 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	3984 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	3985
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23586 diff changeset	3986 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	3987 "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	3988 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	3989 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	3990
27852 4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3991 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	3992 "acquire_lock() -> None\n\
27853 5620b0786271 Cleanup from patch #683257: Neal Norwitz <nnorwitz@gmail.com> parents: 27852 diff changeset	3993 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	3994 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	3995 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	3996 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	3997
4b75a0b76857 Provide access to the import lock, fixing SF bug #580952. This is Guido van Rossum <guido@python.org> parents: 27357 diff changeset	3998 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	3999 "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	4000 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	4001 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	4002
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	4003 static PyMethodDef imp_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4004 {"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	4005 {"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	4006 {"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	4007 {"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	4008 {"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	4009 {"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	4010 {"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	4011 {"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	4012 {"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	4013 {"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	4014 {"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	4015 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	4016 {"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	4017 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	4018 /* The rest are obsolete */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4019 {"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	4020 {"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	4021 {"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	4022 {"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	4023 {"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	4024 {"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	4025 {"load_compiled", imp_load_compiled, METH_VARARGS},
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	4026 #ifdef HAVE_DYNAMIC_LOADING
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4027 {"load_dynamic", imp_load_dynamic, METH_VARARGS},
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11602 diff changeset	4028 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4029 {"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	4030 {"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	4031 {"_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	4032 {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	4033 };
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2040 diff changeset	4034
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8613 diff changeset	4035 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	4036 setint(PyObject d, char name, int value)
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	4037 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4038 PyObject *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4039 int err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4040
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4041 v = PyLong_FromLong((long)value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4042 err = PyDict_SetItemString(d, name, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4043 Py_XDECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4044 return err;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	4045 }
4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	4046
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4047 typedef struct {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4048 PyObject_HEAD
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4049 } NullImporter;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4050
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4051 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4052 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	4053 {
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4054 #ifndef MS_WINDOWS
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4055 PyObject *path;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4056 struct stat statbuf;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4057 int rv;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4058
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4059 if (!_PyArg_NoKeywords("NullImporter()", kwds))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4060 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4061
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4062 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	4063 PyUnicode_FSConverter, &path))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4064 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4065
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4066 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	4067 Py_DECREF(path);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4068 PyErr_SetString(PyExc_ImportError, "empty pathname");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4069 return -1;
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4070 }
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4071
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4072 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	4073 Py_DECREF(path);
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4074 if (rv == 0) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4075 /* it exists */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4076 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	4077 /* it's a directory */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4078 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	4079 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4080 }
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4081 }
50991 a823c9f3a452 Merged revisions 68457 via svnmerge from Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 50619 diff changeset	4082 #else /* MS_WINDOWS */
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4083 PyObject *pathobj;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4084 DWORD rv;
65008 c620fe87c703 Issue #9979: Use PyUnicode_AsWideCharString() in import.c Victor Stinner <victor.stinner@haypocalc.com> parents: 64838 diff changeset	4085 wchar_t *path;
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4086
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4087 if (!_PyArg_NoKeywords("NullImporter()", kwds))
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4088 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4089
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4090 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	4091 &pathobj))
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4092 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4093
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4094 if (PyUnicode_GET_SIZE(pathobj) == 0) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4095 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	4096 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4097 }
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4098
65157 e3ae5b00ba15 PyUnicode_AsWideCharString() takes a PyObject, not a PyUnicodeObject Victor Stinner <victor.stinner@haypocalc.com> parents: 65027 diff changeset	4099 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	4100 if (path == NULL)
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4101 return -1;
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4102 /* see issue1293 and issue3677:
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4103 * 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	4104 * "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	4105 */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4106 rv = GetFileAttributesW(path);
65008 c620fe87c703 Issue #9979: Use PyUnicode_AsWideCharString() in import.c Victor Stinner <victor.stinner@haypocalc.com> parents: 64838 diff changeset	4107 PyMem_Free(path);
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4108 if (rv != INVALID_FILE_ATTRIBUTES) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4109 /* it exists */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4110 if (rv & FILE_ATTRIBUTE_DIRECTORY) {
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4111 /* it's a directory */
03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4112 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	4113 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4114 }
63945 03e884fac4db Issue #9425: NullImporter constructor is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63857 diff changeset	4115 }
50991 a823c9f3a452 Merged revisions 68457 via svnmerge from Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 50619 diff changeset	4116 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4117 return 0;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4118 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4119
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4120 static PyObject *
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4121 NullImporter_find_module(NullImporter self, PyObject args)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4122 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4123 Py_RETURN_NONE;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4124 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4125
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4126 static PyMethodDef NullImporter_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4127 {"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	4128 "Always return None"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4129 },
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4130 {NULL} /* Sentinel */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4131 };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4132
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4133
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43790 diff changeset	4134 PyTypeObject PyNullImporter_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4135 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4136 "imp.NullImporter", /tp_name/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4137 sizeof(NullImporter), /tp_basicsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4138 0, /tp_itemsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4139 0, /tp_dealloc/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4140 0, /tp_print/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4141 0, /tp_getattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4142 0, /tp_setattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4143 0, /tp_reserved/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4144 0, /tp_repr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4145 0, /tp_as_number/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4146 0, /tp_as_sequence/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4147 0, /tp_as_mapping/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4148 0, /tp_hash /
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4149 0, /tp_call/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4150 0, /tp_str/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4151 0, /tp_getattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4152 0, /tp_setattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4153 0, /tp_as_buffer/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4154 Py_TPFLAGS_DEFAULT, /tp_flags/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4155 "Null importer object", /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4156 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4157 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4158 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4159 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4160 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4161 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4162 NullImporter_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4163 0, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4164 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4165 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4166 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4167 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4168 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4169 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4170 (initproc)NullImporter_init, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4171 0, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4172 PyType_GenericNew /* tp_new */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4173 };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4174
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	4175 static struct PyModuleDef impmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4176 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4177 "imp",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4178 doc_imp,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4179 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4180 imp_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4181 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4182 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4183 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4184 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	4185 };
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	4186
30311 f003e48f562d Bug #794140: cygwin builds do not embed Jason Tishler <jason@tishler.net> parents: 29812 diff changeset	4187 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	4188 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	4189 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4190 PyObject m, d;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4191
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4192 if (PyType_Ready(&PyNullImporter_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4193 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4194
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4195 m = PyModule_Create(&impmodule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4196 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4197 goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4198 d = PyModule_GetDict(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4199 if (d == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4200 goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4201
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4202 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	4203 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	4204 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	4205 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	4206 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	4207 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	4208 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	4209 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	4210 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	4211 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	4212
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4213 Py_INCREF(&PyNullImporter_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4214 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	4215 return m;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	4216 failure:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4217 Py_XDECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4218 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	4219 }
8330 7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4220
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4221
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12543 diff changeset	4222 /* 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	4223 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	4224 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	4225 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	4226
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4227 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	4228
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4229 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	4230 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	4231 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4232 static struct _inittab *our_copy = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4233 struct _inittab *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4234 int i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4235
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4236 /* 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	4237 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	4238 ;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4239 if (n == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4240 return 0; /* Nothing to do */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4241 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	4242 ;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4243
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4244 /* 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	4245 p = our_copy;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4246 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	4247 if (p == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4248 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4249
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4250 /* 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	4251 if (our_copy != PyImport_Inittab)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4252 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	4253 PyImport_Inittab = our_copy = p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4254 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	4255
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4256 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	4257 }
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4258
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4259 /* 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	4260
7a1e7da922f8 New APIs for embedding applications that want to add their own entries Guido van Rossum <guido@python.org> parents: 8012 diff changeset	4261 int
52721 54e093bd887e Merged revisions 71031 via svnmerge from Brett Cannon <bcannon@gmail.com> parents: 52547 diff changeset	4262 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	4263 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4264 struct _inittab newtab[2];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4265
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4266 memset(newtab, '\0', sizeof newtab);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4267
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4268 newtab[0].name = (char *)name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4269 newtab[0].initfunc = initfunc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4270
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59865 diff changeset	4271 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	4272 }
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	4273
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	4274 #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	4275 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	4276 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/import.c @ 70817:dd775b1561ba