cpython-lru_cache-weakref: Modules/zipimport.c annotate

annotate Modules/zipimport.c @ 78069:a8aa77458e12 3.2

Add c_size_t and c_ssize_t to the ctypes summary table.

author	Antoine Pitrou <solipsis@pitrou.net>
date	Thu, 12 Jul 2012 20:31:50 +0200
parents	c5a09a96f533
children	4da48083aaab 2db416b953e8

rev	line source
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1 #include "Python.h"
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	2 #include "structmember.h"
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	3 #include "osdefs.h"
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	4 #include "marshal.h"
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	5 #include <time.h>
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	6
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	7
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	8 #define IS_SOURCE 0x0
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	9 #define IS_BYTECODE 0x1
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	10 #define IS_PACKAGE 0x2
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	11
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	12 struct st_zip_searchorder {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	13 char suffix[14];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	14 int type;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	15 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	16
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	17 /* zip_searchorder defines how we search for a module in the Zip
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	18 archive: we first search for a package __init__, then for
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	19 non-package .pyc, .pyo and .py entries. The .pyc and .pyo entries
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	20 are swapped by initzipimport() if we run in optimized mode. Also,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	21 '/' is replaced by SEP there. */
28391 07617d0904a6 Make private function and data static. Neal Norwitz <nnorwitz@gmail.com> parents: 28103 diff changeset	22 static struct st_zip_searchorder zip_searchorder[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	23 {"/__init__.pyc", IS_PACKAGE \| IS_BYTECODE},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	24 {"/__init__.pyo", IS_PACKAGE \| IS_BYTECODE},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	25 {"/__init__.py", IS_PACKAGE \| IS_SOURCE},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	26 {".pyc", IS_BYTECODE},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	27 {".pyo", IS_BYTECODE},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	28 {".py", IS_SOURCE},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	29 {"", 0}
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	30 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	31
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	32 /* zipimporter object definition and support */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	33
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	34 typedef struct _zipimporter ZipImporter;
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	35
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	36 struct _zipimporter {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	37 PyObject_HEAD
65533 1a905391e3ed zipimport: document archive encoding; fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65532 diff changeset	38 PyObject archive; / pathname of the Zip archive,
1a905391e3ed zipimport: document archive encoding; fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65532 diff changeset	39 decoded from the filesystem encoding */
65516 752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	40 PyObject prefix; / file prefix: "a/sub/directory/",
752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	41 encoded to the filesystem encoding */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	42 PyObject files; / dict with file info {path: toc_entry} */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	43 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	44
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	45 static PyObject *ZipImportError;
65514 8f0625954ffa zipimport: fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65398 diff changeset	46 /* read_directory() cache */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	47 static PyObject *zip_directory_cache = NULL;
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	48
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	49 /* forward decls */
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	50 static PyObject read_directory(PyObject archive);
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	51 static PyObject get_data(PyObject archive, PyObject *toc_entry);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	52 static PyObject get_module_code(ZipImporter self, char *fullname,
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	53 int p_ispackage, PyObject *p_modpath);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	54
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	55
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	56 #define ZipImporter_Check(op) PyObject_TypeCheck(op, &ZipImporter_Type)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	57
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	58
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	59 /* zipimporter.__init__
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	60 Split the "subdirectory" from the Zip archive path, lookup a matching
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	61 entry in sys.path_importer_cache, fetch the file directory from there
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	62 if found, or else read it from the archive. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	63 static int
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	64 zipimporter_init(ZipImporter self, PyObject args, PyObject *kwds)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	65 {
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	66 PyObject pathobj, files;
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	67 Py_UNICODE path, p, *prefix, buf[MAXPATHLEN+2];
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	68 Py_ssize_t len;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	69
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	70 if (!_PyArg_NoKeywords("zipimporter()", kwds))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	71 return -1;
35450 97c97194e64b Disallow keyword arguments for type constructors that don't use them Georg Brandl <georg@python.org> parents: 33955 diff changeset	72
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	73 if (!PyArg_ParseTuple(args, "O&:zipimporter",
65533 1a905391e3ed zipimport: document archive encoding; fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65532 diff changeset	74 PyUnicode_FSDecoder, &pathobj))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	75 return -1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	76
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	77 /* copy path to buf */
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	78 len = PyUnicode_GET_SIZE(pathobj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	79 if (len == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	80 PyErr_SetString(ZipImportError, "archive path is empty");
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	81 goto error;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	82 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	83 if (len >= MAXPATHLEN) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	84 PyErr_SetString(ZipImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	85 "archive path too long");
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	86 goto error;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	87 }
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	88 Py_UNICODE_strcpy(buf, PyUnicode_AS_UNICODE(pathobj));
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	89
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	90 #ifdef ALTSEP
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	91 for (p = buf; *p; p++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	92 if (*p == ALTSEP)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	93 *p = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	94 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	95 #endif
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	96
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	97 path = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	98 prefix = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	99 for (;;) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	100 struct stat statbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	101 int rv;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	102
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	103 if (pathobj == NULL) {
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	104 pathobj = PyUnicode_FromUnicode(buf, len);
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	105 if (pathobj == NULL)
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	106 goto error;
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	107 }
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	108 rv = _Py_stat(pathobj, &statbuf);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	109 if (rv == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	110 /* it exists */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	111 if (S_ISREG(statbuf.st_mode))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	112 /* it's a file */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	113 path = buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	114 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	115 }
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	116 else if (PyErr_Occurred())
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	117 goto error;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	118 /* back up one path element */
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	119 p = Py_UNICODE_strrchr(buf, SEP);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	120 if (prefix != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	121 *prefix = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	122 if (p == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	123 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	124 *p = '\0';
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	125 len = p - buf;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	126 prefix = p;
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	127 Py_CLEAR(pathobj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	128 }
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	129 if (path == NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	130 PyErr_SetString(ZipImportError, "not a Zip file");
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	131 goto error;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	132 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	133
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	134 files = PyDict_GetItem(zip_directory_cache, pathobj);
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	135 if (files == NULL) {
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	136 files = read_directory(pathobj);
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	137 if (files == NULL)
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	138 goto error;
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	139 if (PyDict_SetItem(zip_directory_cache, pathobj, files) != 0)
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	140 goto error;
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	141 }
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	142 else
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	143 Py_INCREF(files);
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	144 self->files = files;
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	145
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	146 self->archive = pathobj;
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	147 pathobj = NULL;
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	148
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	149 if (prefix != NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	150 prefix++;
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	151 len = Py_UNICODE_strlen(prefix);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	152 if (prefix[len-1] != SEP) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	153 /* add trailing SEP */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	154 prefix[len] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	155 prefix[len + 1] = '\0';
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	156 len++;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	157 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	158 }
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	159 else
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	160 len = 0;
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	161 self->prefix = PyUnicode_FromUnicode(prefix, len);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	162 if (self->prefix == NULL)
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	163 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	164
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	165 return 0;
63986 a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	166
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	167 error:
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	168 Py_XDECREF(pathobj);
a6592fcf75e7 Issue #9425: zipimporter_init() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63117 diff changeset	169 return -1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	170 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	171
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	172 /* GC support. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	173 static int
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	174 zipimporter_traverse(PyObject obj, visitproc visit, void arg)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	175 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	176 ZipImporter self = (ZipImporter )obj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	177 Py_VISIT(self->files);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	178 return 0;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	179 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	180
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	181 static void
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	182 zipimporter_dealloc(ZipImporter *self)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	183 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	184 PyObject_GC_UnTrack(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	185 Py_XDECREF(self->archive);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	186 Py_XDECREF(self->prefix);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	187 Py_XDECREF(self->files);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	188 Py_TYPE(self)->tp_free((PyObject *)self);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	189 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	190
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	191 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	192 zipimporter_repr(ZipImporter *self)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	193 {
64091 0c8bfd285ef9 Issue #9425: zipimporter_repr() uses unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 64090 diff changeset	194 if (self->archive == NULL)
0c8bfd285ef9 Issue #9425: zipimporter_repr() uses unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 64090 diff changeset	195 return PyUnicode_FromString("<zipimporter object \"???\">");
0c8bfd285ef9 Issue #9425: zipimporter_repr() uses unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 64090 diff changeset	196 else if (self->prefix != NULL && PyUnicode_GET_SIZE(self->prefix) != 0)
65534 8912192982cc zipimport: remove arbitrary length limit from message formats Victor Stinner <victor.stinner@haypocalc.com> parents: 65533 diff changeset	197 return PyUnicode_FromFormat("<zipimporter object \"%U%c%U\">",
64091 0c8bfd285ef9 Issue #9425: zipimporter_repr() uses unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 64090 diff changeset	198 self->archive, SEP, self->prefix);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	199 else
65534 8912192982cc zipimport: remove arbitrary length limit from message formats Victor Stinner <victor.stinner@haypocalc.com> parents: 65533 diff changeset	200 return PyUnicode_FromFormat("<zipimporter object \"%U\">",
64091 0c8bfd285ef9 Issue #9425: zipimporter_repr() uses unicode Victor Stinner <victor.stinner@haypocalc.com> parents: 64090 diff changeset	201 self->archive);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	202 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	203
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	204 /* return fullname.split(".")[-1] */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	205 static char *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	206 get_subname(char *fullname)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	207 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	208 char *subname = strrchr(fullname, '.');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	209 if (subname == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	210 subname = fullname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	211 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	212 subname++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	213 return subname;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	214 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	215
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	216 /* Given a (sub)modulename, write the potential file path in the
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	217 archive (without extension) to the path buffer. Return the
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	218 length of the resulting string. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	219 static int
65528 246c08c825a1 zipimport: pass path size to make_filename() Victor Stinner <victor.stinner@haypocalc.com> parents: 65521 diff changeset	220 make_filename(PyObject prefix_obj, char name, char *path, size_t pathsize)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	221 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	222 size_t len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	223 char *p;
65516 752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	224 PyObject *prefix;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	225
65516 752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	226 prefix = PyUnicode_EncodeFSDefault(prefix_obj);
752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	227 if (prefix == NULL)
752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	228 return -1;
752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	229 len = PyBytes_GET_SIZE(prefix);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	230
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	231 /* self.prefix + name [+ SEP + "__init__"] + ".py[co]" */
65528 246c08c825a1 zipimport: pass path size to make_filename() Victor Stinner <victor.stinner@haypocalc.com> parents: 65521 diff changeset	232 if (len + strlen(name) + 13 >= pathsize - 1) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	233 PyErr_SetString(ZipImportError, "path too long");
65516 752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	234 Py_DECREF(prefix);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	235 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	236 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	237
65516 752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	238 strcpy(path, PyBytes_AS_STRING(prefix));
752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	239 Py_DECREF(prefix);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	240 strcpy(path + len, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	241 for (p = path + len; *p; p++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	242 if (*p == '.')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	243 *p = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	244 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	245 len += strlen(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	246 assert(len < INT_MAX);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	247 return (int)len;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	248 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	249
33955 77b1c15174b4 SF patch 1062495: Modules/zipimport.c does not compile on solaris Raymond Hettinger <python@rcn.com> parents: 30365 diff changeset	250 enum zi_module_info {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	251 MI_ERROR,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	252 MI_NOT_FOUND,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	253 MI_MODULE,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	254 MI_PACKAGE
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	255 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	256
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	257 /* Return some information about a module. */
33955 77b1c15174b4 SF patch 1062495: Modules/zipimport.c does not compile on solaris Raymond Hettinger <python@rcn.com> parents: 30365 diff changeset	258 static enum zi_module_info
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	259 get_module_info(ZipImporter self, char fullname)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	260 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	261 char *subname, path[MAXPATHLEN + 1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	262 int len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	263 struct st_zip_searchorder *zso;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	264
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	265 subname = get_subname(fullname);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	266
65528 246c08c825a1 zipimport: pass path size to make_filename() Victor Stinner <victor.stinner@haypocalc.com> parents: 65521 diff changeset	267 len = make_filename(self->prefix, subname, path, sizeof(path));
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	268 if (len < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	269 return MI_ERROR;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	270
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	271 for (zso = zip_searchorder; *zso->suffix; zso++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	272 strcpy(path + len, zso->suffix);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	273 if (PyDict_GetItemString(self->files, path) != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	274 if (zso->type & IS_PACKAGE)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	275 return MI_PACKAGE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	276 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	277 return MI_MODULE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	278 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	279 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	280 return MI_NOT_FOUND;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	281 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	282
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	283 /* Check whether we can satisfy the import of the module named by
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	284 'fullname'. Return self if we can, None if we can't. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	285 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	286 zipimporter_find_module(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	287 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	288 ZipImporter self = (ZipImporter )obj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	289 PyObject *path = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	290 char *fullname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	291 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	292
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	293 if (!PyArg_ParseTuple(args, "s\|O:zipimporter.find_module",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	294 &fullname, &path))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	295 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	296
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	297 mi = get_module_info(self, fullname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	298 if (mi == MI_ERROR)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	299 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	300 if (mi == MI_NOT_FOUND) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	301 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	302 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	303 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	304 Py_INCREF(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	305 return (PyObject *)self;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	306 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	307
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	308 /* Load and return the module named by 'fullname'. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	309 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	310 zipimporter_load_module(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	311 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	312 ZipImporter self = (ZipImporter )obj;
65517 c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	313 PyObject code = NULL, mod, *dict;
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	314 char *fullname;
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	315 PyObject modpath = NULL, modpath_bytes;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	316 int ispackage;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	317
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	318 if (!PyArg_ParseTuple(args, "s:zipimporter.load_module",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	319 &fullname))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	320 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	321
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	322 code = get_module_code(self, fullname, &ispackage, &modpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	323 if (code == NULL)
65517 c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	324 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	325
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	326 mod = PyImport_AddModule(fullname);
65517 c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	327 if (mod == NULL)
c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	328 goto error;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	329 dict = PyModule_GetDict(mod);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	330
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	331 /* mod.__loader__ = self */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	332 if (PyDict_SetItemString(dict, "__loader__", (PyObject *)self) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	333 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	334
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	335 if (ispackage) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	336 /* add __path__ to the module before the code gets
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	337 executed */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	338 PyObject pkgpath, fullpath;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	339 char *subname = get_subname(fullname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	340 int err;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	341
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	342 fullpath = PyUnicode_FromFormat("%U%c%U%s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	343 self->archive, SEP,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	344 self->prefix, subname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	345 if (fullpath == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	346 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	347
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	348 pkgpath = Py_BuildValue("[O]", fullpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	349 Py_DECREF(fullpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	350 if (pkgpath == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	351 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	352 err = PyDict_SetItemString(dict, "__path__", pkgpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	353 Py_DECREF(pkgpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	354 if (err != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	355 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	356 }
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	357 modpath_bytes = PyUnicode_EncodeFSDefault(modpath);
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	358 if (modpath_bytes == NULL)
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	359 goto error;
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	360 mod = PyImport_ExecCodeModuleEx(fullname, code,
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	361 PyBytes_AS_STRING(modpath_bytes));
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	362 Py_DECREF(modpath_bytes);
65517 c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	363 Py_CLEAR(code);
c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	364 if (mod == NULL)
c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	365 goto error;
c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	366
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	367 if (Py_VerboseFlag)
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	368 PySys_FormatStderr("import %s # loaded from Zip %U\n",
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	369 fullname, modpath);
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	370 Py_DECREF(modpath);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	371 return mod;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	372 error:
65517 c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	373 Py_XDECREF(code);
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	374 Py_XDECREF(modpath);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	375 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	376 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	377
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	378 /* Return a string matching __file__ for the named module */
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	379 static PyObject *
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	380 zipimporter_get_filename(PyObject obj, PyObject args)
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	381 {
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	382 ZipImporter self = (ZipImporter )obj;
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	383 PyObject *code;
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	384 char *fullname;
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	385 PyObject *modpath;
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	386 int ispackage;
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	387
51456 74d196c542f7 Merged revisions 69425 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 51271 diff changeset	388 if (!PyArg_ParseTuple(args, "s:zipimporter.get_filename",
65533 1a905391e3ed zipimport: document archive encoding; fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65532 diff changeset	389 &fullname))
65514 8f0625954ffa zipimport: fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65398 diff changeset	390 return NULL;
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	391
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	392 /* Deciding the filename requires working out where the code
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	393 would come from if the module was actually loaded */
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	394 code = get_module_code(self, fullname, &ispackage, &modpath);
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	395 if (code == NULL)
65514 8f0625954ffa zipimport: fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65398 diff changeset	396 return NULL;
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	397 Py_DECREF(code); /* Only need the path info */
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	398
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	399 return modpath;
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	400 }
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	401
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	402 /* Return a bool signifying whether the module is a package or not. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	403 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	404 zipimporter_is_package(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	405 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	406 ZipImporter self = (ZipImporter )obj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	407 char *fullname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	408 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	409
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	410 if (!PyArg_ParseTuple(args, "s:zipimporter.is_package",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	411 &fullname))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	412 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	413
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	414 mi = get_module_info(self, fullname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	415 if (mi == MI_ERROR)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	416 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	417 if (mi == MI_NOT_FOUND) {
65534 8912192982cc zipimport: remove arbitrary length limit from message formats Victor Stinner <victor.stinner@haypocalc.com> parents: 65533 diff changeset	418 PyErr_Format(ZipImportError, "can't find module '%s'", fullname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	419 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	420 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	421 return PyBool_FromLong(mi == MI_PACKAGE);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	422 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	423
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	424 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	425 zipimporter_get_data(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	426 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	427 ZipImporter self = (ZipImporter )obj;
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	428 PyObject pathobj, key;
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	429 const Py_UNICODE *path;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	430 #ifdef ALTSEP
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	431 Py_UNICODE *p, buf[MAXPATHLEN + 1];
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	432 #endif
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	433 Py_UNICODE *archive;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	434 PyObject *toc_entry;
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	435 Py_ssize_t path_len, len;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	436
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	437 if (!PyArg_ParseTuple(args, "U:zipimporter.get_data", &pathobj))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	438 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	439
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	440 path_len = PyUnicode_GET_SIZE(pathobj);
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	441 path = PyUnicode_AS_UNICODE(pathobj);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	442 #ifdef ALTSEP
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	443 if (path_len >= MAXPATHLEN) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	444 PyErr_SetString(ZipImportError, "path too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	445 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	446 }
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	447 Py_UNICODE_strcpy(buf, path);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	448 for (p = buf; *p; p++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	449 if (*p == ALTSEP)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	450 *p = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	451 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	452 path = buf;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	453 #endif
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	454 archive = PyUnicode_AS_UNICODE(self->archive);
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	455 len = PyUnicode_GET_SIZE(self->archive);
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	456 if ((size_t)len < Py_UNICODE_strlen(path) &&
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	457 Py_UNICODE_strncmp(path, archive, len) == 0 &&
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	458 path[len] == SEP) {
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	459 path += len + 1;
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	460 path_len -= len + 1;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	461 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	462
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	463 key = PyUnicode_FromUnicode(path, path_len);
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	464 if (key == NULL)
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	465 return NULL;
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	466 toc_entry = PyDict_GetItem(self->files, key);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	467 if (toc_entry == NULL) {
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	468 PyErr_SetFromErrnoWithFilenameObject(PyExc_IOError, key);
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	469 Py_DECREF(key);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	470 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	471 }
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	472 Py_DECREF(key);
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	473 return get_data(self->archive, toc_entry);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	474 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	475
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	476 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	477 zipimporter_get_code(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	478 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	479 ZipImporter self = (ZipImporter )obj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	480 char *fullname;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	481
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	482 if (!PyArg_ParseTuple(args, "s:zipimporter.get_code", &fullname))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	483 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	484
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	485 return get_module_code(self, fullname, NULL, NULL);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	486 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	487
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	488 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	489 zipimporter_get_source(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	490 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	491 ZipImporter self = (ZipImporter )obj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	492 PyObject *toc_entry;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	493 char fullname, subname, path[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	494 int len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	495 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	496
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	497 if (!PyArg_ParseTuple(args, "s:zipimporter.get_source", &fullname))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	498 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	499
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	500 mi = get_module_info(self, fullname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	501 if (mi == MI_ERROR)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	502 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	503 if (mi == MI_NOT_FOUND) {
65534 8912192982cc zipimport: remove arbitrary length limit from message formats Victor Stinner <victor.stinner@haypocalc.com> parents: 65533 diff changeset	504 PyErr_Format(ZipImportError, "can't find module '%s'", fullname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	505 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	506 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	507 subname = get_subname(fullname);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	508
65528 246c08c825a1 zipimport: pass path size to make_filename() Victor Stinner <victor.stinner@haypocalc.com> parents: 65521 diff changeset	509 len = make_filename(self->prefix, subname, path, sizeof(path));
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	510 if (len < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	511 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	512
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	513 if (mi == MI_PACKAGE) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	514 path[len] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	515 strcpy(path + len + 1, "__init__.py");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	516 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	517 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	518 strcpy(path + len, ".py");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	519
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	520 toc_entry = PyDict_GetItemString(self->files, path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	521 if (toc_entry != NULL) {
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	522 PyObject res, bytes;
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	523 bytes = get_data(self->archive, toc_entry);
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	524 if (bytes == NULL)
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	525 return NULL;
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	526 res = PyUnicode_FromStringAndSize(PyBytes_AS_STRING(bytes),
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	527 PyBytes_GET_SIZE(bytes));
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	528 Py_DECREF(bytes);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	529 return res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	530 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	531
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	532 /* we have the module, but no source */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	533 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	534 return Py_None;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	535 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	536
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	537 PyDoc_STRVAR(doc_find_module,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	538 "find_module(fullname, path=None) -> self or None.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	539 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	540 Search for a module specified by 'fullname'. 'fullname' must be the\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	541 fully qualified (dotted) module name. It returns the zipimporter\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	542 instance itself if the module was found, or None if it wasn't.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	543 The optional 'path' argument is ignored -- it's there for compatibility\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	544 with the importer protocol.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	545
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	546 PyDoc_STRVAR(doc_load_module,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	547 "load_module(fullname) -> module.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	548 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	549 Load the module specified by 'fullname'. 'fullname' must be the\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	550 fully qualified (dotted) module name. It returns the imported\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	551 module, or raises ZipImportError if it wasn't found.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	552
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	553 PyDoc_STRVAR(doc_get_data,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	554 "get_data(pathname) -> string with file data.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	555 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	556 Return the data associated with 'pathname'. Raise IOError if\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	557 the file wasn't found.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	558
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	559 PyDoc_STRVAR(doc_is_package,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	560 "is_package(fullname) -> bool.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	561 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	562 Return True if the module specified by fullname is a package.\n\
63117 bfdb5f08c0f8 Fix #9316. if/is grammar corrections. Brian Curtin <brian.curtin@gmail.com> parents: 61466 diff changeset	563 Raise ZipImportError if the module couldn't be found.");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	564
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	565 PyDoc_STRVAR(doc_get_code,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	566 "get_code(fullname) -> code object.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	567 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	568 Return the code object for the specified module. Raise ZipImportError\n\
63117 bfdb5f08c0f8 Fix #9316. if/is grammar corrections. Brian Curtin <brian.curtin@gmail.com> parents: 61466 diff changeset	569 if the module couldn't be found.");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	570
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	571 PyDoc_STRVAR(doc_get_source,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	572 "get_source(fullname) -> source string.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	573 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	574 Return the source code for the specified module. Raise ZipImportError\n\
63117 bfdb5f08c0f8 Fix #9316. if/is grammar corrections. Brian Curtin <brian.curtin@gmail.com> parents: 61466 diff changeset	575 if the module couldn't be found, return None if the archive does\n\
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	576 contain the module, but has no source for it.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	577
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	578
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	579 PyDoc_STRVAR(doc_get_filename,
51456 74d196c542f7 Merged revisions 69425 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 51271 diff changeset	580 "get_filename(fullname) -> filename string.\n\
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	581 \n\
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	582 Return the filename for the specified module.");
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	583
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	584 static PyMethodDef zipimporter_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	585 {"find_module", zipimporter_find_module, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	586 doc_find_module},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	587 {"load_module", zipimporter_load_module, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	588 doc_load_module},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	589 {"get_data", zipimporter_get_data, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	590 doc_get_data},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	591 {"get_code", zipimporter_get_code, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	592 doc_get_code},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	593 {"get_source", zipimporter_get_source, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	594 doc_get_source},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	595 {"get_filename", zipimporter_get_filename, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	596 doc_get_filename},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	597 {"is_package", zipimporter_is_package, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	598 doc_is_package},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	599 {NULL, NULL} /* sentinel */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	600 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	601
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	602 static PyMemberDef zipimporter_members[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	603 {"archive", T_OBJECT, offsetof(ZipImporter, archive), READONLY},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	604 {"prefix", T_OBJECT, offsetof(ZipImporter, prefix), READONLY},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	605 {"_files", T_OBJECT, offsetof(ZipImporter, files), READONLY},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	606 {NULL}
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	607 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	608
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	609 PyDoc_STRVAR(zipimporter_doc,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	610 "zipimporter(archivepath) -> zipimporter object\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	611 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	612 Create a new zipimporter instance. 'archivepath' must be a path to\n\
47072 0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46718 diff changeset	613 a zipfile, or to a specific path inside a zipfile. For example, it can be\n\
0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46718 diff changeset	614 '/tmp/myimport.zip', or '/tmp/myimport.zip/mydirectory', if mydirectory is a\n\
0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46718 diff changeset	615 valid directory inside the archive.\n\
0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46718 diff changeset	616 \n\
0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46718 diff changeset	617 'ZipImportError is raised if 'archivepath' doesn't point to a valid Zip\n\
0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46718 diff changeset	618 archive.\n\
0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46718 diff changeset	619 \n\
0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46718 diff changeset	620 The 'archive' attribute of zipimporter objects contains the name of the\n\
0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46718 diff changeset	621 zipfile targeted.");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	622
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	623 #define DEFERRED_ADDRESS(ADDR) 0
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	624
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	625 static PyTypeObject ZipImporter_Type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	626 PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	627 "zipimport.zipimporter",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	628 sizeof(ZipImporter),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	629 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	630 (destructor)zipimporter_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	631 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	632 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	633 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	634 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	635 (reprfunc)zipimporter_repr, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	636 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	637 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	638 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	639 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	640 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	641 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	642 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	643 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	644 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	645 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	646 Py_TPFLAGS_HAVE_GC, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	647 zipimporter_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	648 zipimporter_traverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	649 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	650 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	651 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	652 0, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	653 0, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	654 zipimporter_methods, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	655 zipimporter_members, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	656 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	657 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	658 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	659 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	660 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	661 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	662 (initproc)zipimporter_init, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	663 PyType_GenericAlloc, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	664 PyType_GenericNew, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	665 PyObject_GC_Del, /* tp_free */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	666 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	667
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	668
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	669 /* implementation */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	670
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	671 /* Given a buffer, return the long that is represented by the first
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	672 4 bytes, encoded as little endian. This partially reimplements
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	673 marshal.c:r_long() */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	674 static long
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	675 get_long(unsigned char *buf) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	676 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	677 x = buf[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	678 x \|= (long)buf[1] << 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	679 x \|= (long)buf[2] << 16;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	680 x \|= (long)buf[3] << 24;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	681 #if SIZEOF_LONG > 4
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	682 /* Sign extension for 64-bit machines */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	683 x \|= -(x & 0x80000000L);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	684 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	685 return x;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	686 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	687
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	688 /*
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	689 read_directory(archive) -> files dict (new reference)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	690
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	691 Given a path to a Zip archive, build a dict, mapping file names
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	692 (local to the archive, using SEP as a separator) to toc entries.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	693
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	694 A toc_entry is a tuple:
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	695
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	696 (__file__, # value to use for __file__, available for all files,
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	697 # encoded to the filesystem encoding
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	698 compress, # compression kind; 0 for uncompressed
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	699 data_size, # size of compressed data on disk
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	700 file_size, # size of decompressed data
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	701 file_offset, # offset of file header from start of archive
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	702 time, # mod time of file (in dos format)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	703 date, # mod data of file (in dos format)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	704 crc, # crc checksum of the data
65514 8f0625954ffa zipimport: fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65398 diff changeset	705 )
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	706
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	707 Directories can be recognized by the trailing SEP in the name,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	708 data_size and file_offset are 0.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	709 */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	710 static PyObject *
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	711 read_directory(PyObject *archive_obj)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	712 {
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	713 /* FIXME: work on Py_UNICODE* instead of char* */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	714 PyObject *files = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	715 FILE *fp;
65520 372c9807d75d zipimport: read_directory() uses cp437 or utf-8 (in strict mode), depending on Victor Stinner <victor.stinner@haypocalc.com> parents: 65518 diff changeset	716 unsigned short flags;
74690 c5a09a96f533 Fix zip_import.c's read_directory() to use appropriate types for the values Gregory P. Smith <greg@krypto.org> parents: 74059 diff changeset	717 short compress, time, date, name_size;
c5a09a96f533 Fix zip_import.c's read_directory() to use appropriate types for the values Gregory P. Smith <greg@krypto.org> parents: 74059 diff changeset	718 long crc, data_size, file_size, header_size;
c5a09a96f533 Fix zip_import.c's read_directory() to use appropriate types for the values Gregory P. Smith <greg@krypto.org> parents: 74059 diff changeset	719 Py_ssize_t file_offset, header_position, header_offset;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	720 long i, l, count;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	721 size_t length;
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	722 Py_UNICODE path[MAXPATHLEN + 5];
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	723 char name[MAXPATHLEN + 5];
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	724 PyObject *nameobj = NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	725 char *p, endof_central_dir[22];
74690 c5a09a96f533 Fix zip_import.c's read_directory() to use appropriate types for the values Gregory P. Smith <greg@krypto.org> parents: 74059 diff changeset	726 Py_ssize_t arc_offset; /* Absolute offset to start of the zip-archive. */
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	727 PyObject *pathobj;
65520 372c9807d75d zipimport: read_directory() uses cp437 or utf-8 (in strict mode), depending on Victor Stinner <victor.stinner@haypocalc.com> parents: 65518 diff changeset	728 const char *charset;
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	729 int bootstrap;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	730
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	731 if (PyUnicode_GET_SIZE(archive_obj) > MAXPATHLEN) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	732 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	733 "Zip path name is too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	734 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	735 }
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	736 Py_UNICODE_strcpy(path, PyUnicode_AS_UNICODE(archive_obj));
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	737
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	738 fp = _Py_fopen(archive_obj, "rb");
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	739 if (fp == NULL) {
74059 586bcc05f88f Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70215 diff changeset	740 if (!PyErr_Occurred())
586bcc05f88f Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70215 diff changeset	741 PyErr_Format(ZipImportError, "can't open Zip file: '%U'", archive_obj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	742 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	743 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	744 fseek(fp, -22, SEEK_END);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	745 header_position = ftell(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	746 if (fread(endof_central_dir, 1, 22, fp) != 22) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	747 fclose(fp);
65534 8912192982cc zipimport: remove arbitrary length limit from message formats Victor Stinner <victor.stinner@haypocalc.com> parents: 65533 diff changeset	748 PyErr_Format(ZipImportError, "can't read Zip file: '%U'", archive_obj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	749 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	750 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	751 if (get_long((unsigned char *)endof_central_dir) != 0x06054B50) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	752 /* Bad: End of Central Dir signature */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	753 fclose(fp);
65534 8912192982cc zipimport: remove arbitrary length limit from message formats Victor Stinner <victor.stinner@haypocalc.com> parents: 65533 diff changeset	754 PyErr_Format(ZipImportError, "not a Zip file: '%U'", archive_obj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	755 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	756 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	757
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	758 header_size = get_long((unsigned char *)endof_central_dir + 12);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	759 header_offset = get_long((unsigned char *)endof_central_dir + 16);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	760 arc_offset = header_position - header_offset - header_size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	761 header_offset += arc_offset;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	762
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	763 files = PyDict_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	764 if (files == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	765 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	766
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	767 length = Py_UNICODE_strlen(path);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	768 path[length] = SEP;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	769
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	770 /* Start of Central Directory */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	771 count = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	772 for (;;) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	773 PyObject *t;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	774 int err;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	775
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	776 fseek(fp, header_offset, 0); /* Start of file header */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	777 l = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	778 if (l != 0x02014B50)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	779 break; /* Bad: Central Dir File Header */
65520 372c9807d75d zipimport: read_directory() uses cp437 or utf-8 (in strict mode), depending on Victor Stinner <victor.stinner@haypocalc.com> parents: 65518 diff changeset	780 fseek(fp, header_offset + 8, 0);
372c9807d75d zipimport: read_directory() uses cp437 or utf-8 (in strict mode), depending on Victor Stinner <victor.stinner@haypocalc.com> parents: 65518 diff changeset	781 flags = (unsigned short)PyMarshal_ReadShortFromFile(fp);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	782 compress = PyMarshal_ReadShortFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	783 time = PyMarshal_ReadShortFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	784 date = PyMarshal_ReadShortFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	785 crc = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	786 data_size = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	787 file_size = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	788 name_size = PyMarshal_ReadShortFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	789 header_size = 46 + name_size +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	790 PyMarshal_ReadShortFromFile(fp) +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	791 PyMarshal_ReadShortFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	792 fseek(fp, header_offset + 42, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	793 file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	794 if (name_size > MAXPATHLEN)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	795 name_size = MAXPATHLEN;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	796
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	797 p = name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	798 for (i = 0; i < name_size; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	799 *p = (char)getc(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	800 if (*p == '/')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	801 *p = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	802 p++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	803 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	804 p = 0; / Add terminating null byte */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	805 header_offset += header_size;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	806
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	807 bootstrap = 0;
65520 372c9807d75d zipimport: read_directory() uses cp437 or utf-8 (in strict mode), depending on Victor Stinner <victor.stinner@haypocalc.com> parents: 65518 diff changeset	808 if (flags & 0x0800)
372c9807d75d zipimport: read_directory() uses cp437 or utf-8 (in strict mode), depending on Victor Stinner <victor.stinner@haypocalc.com> parents: 65518 diff changeset	809 charset = "utf-8";
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	810 else if (!PyThreadState_GET()->interp->codecs_initialized) {
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	811 /* During bootstrap, we may need to load the encodings
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	812 package from a ZIP file. But the cp437 encoding is implemented
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	813 in Python in the encodings package.
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	814
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	815 Break out of this dependency by assuming that the path to
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	816 the encodings module is ASCII-only. */
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	817 charset = "ascii";
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	818 bootstrap = 1;
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	819 }
65520 372c9807d75d zipimport: read_directory() uses cp437 or utf-8 (in strict mode), depending on Victor Stinner <victor.stinner@haypocalc.com> parents: 65518 diff changeset	820 else
372c9807d75d zipimport: read_directory() uses cp437 or utf-8 (in strict mode), depending on Victor Stinner <victor.stinner@haypocalc.com> parents: 65518 diff changeset	821 charset = "cp437";
372c9807d75d zipimport: read_directory() uses cp437 or utf-8 (in strict mode), depending on Victor Stinner <victor.stinner@haypocalc.com> parents: 65518 diff changeset	822 nameobj = PyUnicode_Decode(name, name_size, charset, NULL);
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	823 if (nameobj == NULL) {
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	824 if (bootstrap)
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	825 PyErr_Format(PyExc_NotImplementedError,
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	826 "bootstrap issue: python%i%i.zip contains non-ASCII "
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	827 "filenames without the unicode flag",
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	828 PY_MAJOR_VERSION, PY_MINOR_VERSION);
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	829 goto error;
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	830 }
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	831 Py_UNICODE_strncpy(path + length + 1, PyUnicode_AS_UNICODE(nameobj), MAXPATHLEN - length - 1);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	832
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	833 pathobj = PyUnicode_FromUnicode(path, Py_UNICODE_strlen(path));
fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	834 if (pathobj == NULL)
fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	835 goto error;
74690 c5a09a96f533 Fix zip_import.c's read_directory() to use appropriate types for the values Gregory P. Smith <greg@krypto.org> parents: 74059 diff changeset	836 t = Py_BuildValue("Nhllnhhl", pathobj, compress, data_size,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	837 file_size, file_offset, time, date, crc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	838 if (t == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	839 goto error;
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	840 err = PyDict_SetItem(files, nameobj, t);
fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	841 Py_CLEAR(nameobj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	842 Py_DECREF(t);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	843 if (err != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	844 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	845 count++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	846 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	847 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	848 if (Py_VerboseFlag)
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	849 PySys_FormatStderr("# zipimport: found %ld names in %U\n",
fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	850 count, archive_obj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	851 return files;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	852 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	853 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	854 Py_XDECREF(files);
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	855 Py_XDECREF(nameobj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	856 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	857 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	858
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	859 /* Return the zlib.decompress function object, or NULL if zlib couldn't
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	860 be imported. The function is cached when found, so subsequent calls
70214 52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	861 don't import zlib again. */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	862 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	863 get_decompress_func(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	864 {
70214 52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	865 static int importing_zlib = 0;
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	866 PyObject *zlib;
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	867 PyObject *decompress;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	868
70214 52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	869 if (importing_zlib != 0)
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	870 /* Someone has a zlib.py[co] in their Zip file;
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	871 let's avoid a stack overflow. */
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	872 return NULL;
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	873 importing_zlib = 1;
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	874 zlib = PyImport_ImportModuleNoBlock("zlib");
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	875 importing_zlib = 0;
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	876 if (zlib != NULL) {
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	877 decompress = PyObject_GetAttrString(zlib,
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	878 "decompress");
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	879 Py_DECREF(zlib);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	880 }
70214 52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	881 else {
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	882 PyErr_Clear();
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	883 decompress = NULL;
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	884 }
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	885 if (Py_VerboseFlag)
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	886 PySys_WriteStderr("# zipimport: zlib %s\n",
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	887 zlib != NULL ? "available": "UNAVAILABLE");
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	888 return decompress;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	889 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	890
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	891 /* Given a path to a Zip file and a toc_entry, return the (uncompressed)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	892 data as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	893 static PyObject *
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	894 get_data(PyObject archive, PyObject toc_entry)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	895 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	896 PyObject raw_data, data = NULL, *decompress;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	897 char *buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	898 FILE *fp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	899 int err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	900 Py_ssize_t bytes_read = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	901 long l;
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	902 PyObject *datapath;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	903 long compress, data_size, file_size, file_offset, bytes_size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	904 long time, date, crc;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	905
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	906 if (!PyArg_ParseTuple(toc_entry, "Olllllll", &datapath, &compress,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	907 &data_size, &file_size, &file_offset, &time,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	908 &date, &crc)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	909 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	910 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	911
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	912 fp = _Py_fopen(archive, "rb");
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	913 if (!fp) {
74059 586bcc05f88f Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70215 diff changeset	914 if (!PyErr_Occurred())
586bcc05f88f Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70215 diff changeset	915 PyErr_Format(PyExc_IOError,
586bcc05f88f Handle correctly _Py_fopen() error: don't replace the exception Victor Stinner <victor.stinner@haypocalc.com> parents: 70215 diff changeset	916 "zipimport: can not open file %U", archive);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	917 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	918 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	919
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	920 /* Check to make sure the local file header is correct */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	921 fseek(fp, file_offset, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	922 l = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	923 if (l != 0x04034B50) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	924 /* Bad: Local File Header */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	925 PyErr_Format(ZipImportError,
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	926 "bad local file header in %U",
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	927 archive);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	928 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	929 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	930 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	931 fseek(fp, file_offset + 26, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	932 l = 30 + PyMarshal_ReadShortFromFile(fp) +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	933 PyMarshal_ReadShortFromFile(fp); /* local header size */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	934 file_offset += l; /* Start of file data */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	935
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	936 bytes_size = compress == 0 ? data_size : data_size + 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	937 if (bytes_size == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	938 bytes_size++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	939 raw_data = PyBytes_FromStringAndSize((char *)NULL, bytes_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	940
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	941 if (raw_data == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	942 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	943 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	944 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	945 buf = PyBytes_AsString(raw_data);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	946
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	947 err = fseek(fp, file_offset, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	948 if (err == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	949 bytes_read = fread(buf, 1, data_size, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	950 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	951 if (err \|\| bytes_read != data_size) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	952 PyErr_SetString(PyExc_IOError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	953 "zipimport: can't read data");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	954 Py_DECREF(raw_data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	955 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	956 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	957
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	958 if (compress != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	959 buf[data_size] = 'Z'; /* saw this in zipfile.py */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	960 data_size++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	961 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	962 buf[data_size] = '\0';
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	963
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	964 if (compress == 0) { /* data is not compressed */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	965 data = PyBytes_FromStringAndSize(buf, data_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	966 Py_DECREF(raw_data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	967 return data;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	968 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	969
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	970 /* Decompress with zlib */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	971 decompress = get_decompress_func();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	972 if (decompress == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	973 PyErr_SetString(ZipImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	974 "can't decompress data; "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	975 "zlib not available");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	976 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	977 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	978 data = PyObject_CallFunction(decompress, "Oi", raw_data, -15);
70214 52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	979 Py_DECREF(decompress);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	980 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	981 Py_DECREF(raw_data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	982 return data;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	983 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	984
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	985 /* Lenient date/time comparison function. The precision of the mtime
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	986 in the archive is lower than the mtime stored in a .pyc: we
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	987 must allow a difference of at most one second. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	988 static int
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	989 eq_mtime(time_t t1, time_t t2)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	990 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	991 time_t d = t1 - t2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	992 if (d < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	993 d = -d;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	994 /* dostime only stores even seconds, so be lenient */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	995 return d <= 1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	996 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	997
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	998 /* Given the contents of a .py[co] file in a buffer, unmarshal the data
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	999 and return the code object. Return None if it the magic word doesn't
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1000 match (we do this instead of raising an exception as we fall back
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1001 to .py if available and we don't want to mask other errors).
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1002 Returns a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1003 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1004 unmarshal_code(char pathname, PyObject data, time_t mtime)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1005 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1006 PyObject *code;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1007 char *buf = PyBytes_AsString(data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1008 Py_ssize_t size = PyBytes_Size(data);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1009
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1010 if (size <= 9) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1011 PyErr_SetString(ZipImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1012 "bad pyc data");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1013 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1014 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1015
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1016 if (get_long((unsigned char *)buf) != PyImport_GetMagicNumber()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1017 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1018 PySys_WriteStderr("# %s has bad magic\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1019 pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1020 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1021 return Py_None; /* signal caller to try alternative */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1022 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1023
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1024 if (mtime != 0 && !eq_mtime(get_long((unsigned char *)buf + 4),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1025 mtime)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1026 if (Py_VerboseFlag)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1027 PySys_WriteStderr("# %s has bad mtime\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1028 pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1029 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1030 return Py_None; /* signal caller to try alternative */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1031 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1032
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1033 code = PyMarshal_ReadObjectFromString(buf + 8, size - 8);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1034 if (code == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1035 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1036 if (!PyCode_Check(code)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1037 Py_DECREF(code);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1038 PyErr_Format(PyExc_TypeError,
65534 8912192982cc zipimport: remove arbitrary length limit from message formats Victor Stinner <victor.stinner@haypocalc.com> parents: 65533 diff changeset	1039 "compiled module %s is not a code object",
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1040 pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1041 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1042 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1043 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1044 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1045
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1046 /* Replace any occurances of "\r\n?" in the input string with "\n".
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1047 This converts DOS and Mac line endings to Unix line endings.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1048 Also append a trailing "\n" to be compatible with
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1049 PyParser_SimpleParseFile(). Returns a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1050 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1051 normalize_line_endings(PyObject *source)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1052 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1053 char buf, q, *p = PyBytes_AsString(source);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1054 PyObject *fixed_source;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1055 int len = 0;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1056
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1057 if (!p) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1058 return PyBytes_FromStringAndSize("\n\0", 2);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1059 }
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1060
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1061 /* one char extra for trailing \n and one for terminating \0 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1062 buf = (char *)PyMem_Malloc(PyBytes_Size(source) + 2);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1063 if (buf == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1064 PyErr_SetString(PyExc_MemoryError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1065 "zipimport: no memory to allocate "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1066 "source buffer");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1067 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1068 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1069 /* replace "\r\n?" by "\n" */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1070 for (q = buf; *p != '\0'; p++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1071 if (*p == '\r') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1072 *q++ = '\n';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1073 if (*(p + 1) == '\n')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1074 p++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1075 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1076 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1077 q++ = p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1078 len++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1079 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1080 q++ = '\n'; / add trailing \n */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1081 *q = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1082 fixed_source = PyBytes_FromStringAndSize(buf, len + 2);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1083 PyMem_Free(buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1084 return fixed_source;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1085 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1086
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1087 /* Given a string buffer containing Python source code, compile it
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1088 return and return a code object as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1089 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1090 compile_source(char pathname, PyObject source)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1091 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1092 PyObject code, fixed_source;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1093
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1094 fixed_source = normalize_line_endings(source);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1095 if (fixed_source == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1096 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1097
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1098 code = Py_CompileString(PyBytes_AsString(fixed_source), pathname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1099 Py_file_input);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1100 Py_DECREF(fixed_source);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1101 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1102 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1103
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1104 /* Convert the date/time values found in the Zip archive to a value
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1105 that's compatible with the time stamp stored in .pyc files. */
28391 07617d0904a6 Make private function and data static. Neal Norwitz <nnorwitz@gmail.com> parents: 28103 diff changeset	1106 static time_t
07617d0904a6 Make private function and data static. Neal Norwitz <nnorwitz@gmail.com> parents: 28103 diff changeset	1107 parse_dostime(int dostime, int dosdate)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1108 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1109 struct tm stm;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1110
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1111 memset((void *) &stm, '\0', sizeof(stm));
44742 14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44441 diff changeset	1112
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1113 stm.tm_sec = (dostime & 0x1f) * 2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1114 stm.tm_min = (dostime >> 5) & 0x3f;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1115 stm.tm_hour = (dostime >> 11) & 0x1f;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1116 stm.tm_mday = dosdate & 0x1f;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1117 stm.tm_mon = ((dosdate >> 5) & 0x0f) - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1118 stm.tm_year = ((dosdate >> 9) & 0x7f) + 80;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1119 stm.tm_isdst = -1; /* wday/yday is ignored */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1120
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1121 return mktime(&stm);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1122 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1123
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1124 /* Given a path to a .pyc or .pyo file in the archive, return the
68585 bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 68488 diff changeset	1125 modification time of the matching .py file, or 0 if no source
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1126 is available. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1127 static time_t
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1128 get_mtime_of_source(ZipImporter self, char path)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1129 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1130 PyObject *toc_entry;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1131 time_t mtime = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1132 Py_ssize_t lastchar = strlen(path) - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1133 char savechar = path[lastchar];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1134 path[lastchar] = '\0'; /* strip 'c' or 'o' from .py[co] /
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1135 toc_entry = PyDict_GetItemString(self->files, path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1136 if (toc_entry != NULL && PyTuple_Check(toc_entry) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1137 PyTuple_Size(toc_entry) == 8) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1138 /* fetch the time stamp of the .py file for comparison
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1139 with an embedded pyc time stamp */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1140 int time, date;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1141 time = PyLong_AsLong(PyTuple_GetItem(toc_entry, 5));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1142 date = PyLong_AsLong(PyTuple_GetItem(toc_entry, 6));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1143 mtime = parse_dostime(time, date);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1144 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1145 path[lastchar] = savechar;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1146 return mtime;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1147 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1148
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1149 /* Return the code object for the module named by 'fullname' from the
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1150 Zip archive as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1151 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1152 get_code_from_data(ZipImporter *self, int ispackage, int isbytecode,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1153 time_t mtime, PyObject *toc_entry)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1154 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1155 PyObject data, code;
65521 77c13c9c6e59 get_code_from_data() uses the filesystem encoding to encode the module path, Victor Stinner <victor.stinner@haypocalc.com> parents: 65520 diff changeset	1156 PyObject *modpath;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1157
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	1158 data = get_data(self->archive, toc_entry);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1159 if (data == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1160 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1161
65521 77c13c9c6e59 get_code_from_data() uses the filesystem encoding to encode the module path, Victor Stinner <victor.stinner@haypocalc.com> parents: 65520 diff changeset	1162 modpath = PyUnicode_EncodeFSDefault(PyTuple_GetItem(toc_entry, 0));
65398 76c888fd2380 zipimport: catch _PyUnicode_AsString() failure in get_code_from_data() Victor Stinner <victor.stinner@haypocalc.com> parents: 64091 diff changeset	1163 if (modpath == NULL) {
76c888fd2380 zipimport: catch _PyUnicode_AsString() failure in get_code_from_data() Victor Stinner <victor.stinner@haypocalc.com> parents: 64091 diff changeset	1164 Py_DECREF(data);
76c888fd2380 zipimport: catch _PyUnicode_AsString() failure in get_code_from_data() Victor Stinner <victor.stinner@haypocalc.com> parents: 64091 diff changeset	1165 return NULL;
76c888fd2380 zipimport: catch _PyUnicode_AsString() failure in get_code_from_data() Victor Stinner <victor.stinner@haypocalc.com> parents: 64091 diff changeset	1166 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1167
65521 77c13c9c6e59 get_code_from_data() uses the filesystem encoding to encode the module path, Victor Stinner <victor.stinner@haypocalc.com> parents: 65520 diff changeset	1168 if (isbytecode)
77c13c9c6e59 get_code_from_data() uses the filesystem encoding to encode the module path, Victor Stinner <victor.stinner@haypocalc.com> parents: 65520 diff changeset	1169 code = unmarshal_code(PyBytes_AS_STRING(modpath), data, mtime);
77c13c9c6e59 get_code_from_data() uses the filesystem encoding to encode the module path, Victor Stinner <victor.stinner@haypocalc.com> parents: 65520 diff changeset	1170 else
77c13c9c6e59 get_code_from_data() uses the filesystem encoding to encode the module path, Victor Stinner <victor.stinner@haypocalc.com> parents: 65520 diff changeset	1171 code = compile_source(PyBytes_AS_STRING(modpath), data);
77c13c9c6e59 get_code_from_data() uses the filesystem encoding to encode the module path, Victor Stinner <victor.stinner@haypocalc.com> parents: 65520 diff changeset	1172 Py_DECREF(modpath);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1173 Py_DECREF(data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1174 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1175 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1176
68488 0991b40e895d #11515: fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 63117 diff changeset	1177 /* Get the code object associated with the module specified by
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1178 'fullname'. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1179 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1180 get_module_code(ZipImporter self, char fullname,
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	1181 int p_ispackage, PyObject *p_modpath)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1182 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1183 PyObject *toc_entry;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1184 char *subname, path[MAXPATHLEN + 1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1185 int len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1186 struct st_zip_searchorder *zso;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1187
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1188 subname = get_subname(fullname);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1189
65528 246c08c825a1 zipimport: pass path size to make_filename() Victor Stinner <victor.stinner@haypocalc.com> parents: 65521 diff changeset	1190 len = make_filename(self->prefix, subname, path, sizeof(path));
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1191 if (len < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1192 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1193
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1194 for (zso = zip_searchorder; *zso->suffix; zso++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1195 PyObject *code = NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1196
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1197 strcpy(path + len, zso->suffix);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1198 if (Py_VerboseFlag > 1)
65515 cdfd198a6f1d zipimport, get_module_code(): avoid useless _PyUnicode_AsString() Victor Stinner <victor.stinner@haypocalc.com> parents: 65514 diff changeset	1199 PySys_FormatStderr("# trying %U%c%s\n",
65516 752e4b5c64e9 zipimport: encode the prefix to the fileystem encoding Victor Stinner <victor.stinner@haypocalc.com> parents: 65515 diff changeset	1200 self->archive, (int)SEP, path);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1201 toc_entry = PyDict_GetItemString(self->files, path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1202 if (toc_entry != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1203 time_t mtime = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1204 int ispackage = zso->type & IS_PACKAGE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1205 int isbytecode = zso->type & IS_BYTECODE;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1206
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1207 if (isbytecode)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1208 mtime = get_mtime_of_source(self, path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1209 if (p_ispackage != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1210 *p_ispackage = ispackage;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1211 code = get_code_from_data(self, ispackage,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1212 isbytecode, mtime,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1213 toc_entry);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1214 if (code == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1215 /* bad magic number or non-matching mtime
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1216 in byte code, try next */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1217 Py_DECREF(code);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1218 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1219 }
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	1220 if (code != NULL && p_modpath != NULL) {
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	1221 *p_modpath = PyTuple_GetItem(toc_entry, 0);
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	1222 Py_INCREF(*p_modpath);
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	1223 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1224 return code;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1225 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1226 }
65534 8912192982cc zipimport: remove arbitrary length limit from message formats Victor Stinner <victor.stinner@haypocalc.com> parents: 65533 diff changeset	1227 PyErr_Format(ZipImportError, "can't find module '%s'", fullname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1228 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1229 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1230
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1231
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1232 /* Module init */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1233
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1234 PyDoc_STRVAR(zipimport_doc,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1235 "zipimport provides support for importing Python modules from Zip archives.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1236 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1237 This module exports three objects:\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1238 - zipimporter: a class; its constructor takes a path to a Zip archive.\n\
36296 c7cfea1ebb32 the implementation uses ZipImportError, not ZipImporterError... Fredrik Lundh <fredrik@pythonware.com> parents: 36230 diff changeset	1239 - ZipImportError: exception raised by zipimporter objects. It's a\n\
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1240 subclass of ImportError, so it can be caught as ImportError, too.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1241 - _zip_directory_cache: a dict, mapping archive paths to zip directory\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1242 info dicts, as used in zipimporter._files.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1243 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1244 It is usually not needed to use the zipimport module explicitly; it is\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1245 used by the builtin import mechanism for sys.path items that are paths\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1246 to Zip archives.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1247
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1248 static struct PyModuleDef zipimportmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1249 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1250 "zipimport",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1251 zipimport_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1252 -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1253 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1254 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1255 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1256 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1257 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1258 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1259
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1260 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1261 PyInit_zipimport(void)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1262 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1263 PyObject *mod;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1264
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1265 if (PyType_Ready(&ZipImporter_Type) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1266 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1267
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1268 /* Correct directory separator */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1269 zip_searchorder[0].suffix[0] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1270 zip_searchorder[1].suffix[0] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1271 zip_searchorder[2].suffix[0] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1272 if (Py_OptimizeFlag) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1273 /* Reverse .pyc and .pyo */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1274 struct st_zip_searchorder tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1275 tmp = zip_searchorder[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1276 zip_searchorder[0] = zip_searchorder[1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1277 zip_searchorder[1] = tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1278 tmp = zip_searchorder[3];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1279 zip_searchorder[3] = zip_searchorder[4];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1280 zip_searchorder[4] = tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1281 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1282
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1283 mod = PyModule_Create(&zipimportmodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1284 if (mod == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1285 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1286
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1287 ZipImportError = PyErr_NewException("zipimport.ZipImportError",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1288 PyExc_ImportError, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1289 if (ZipImportError == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1290 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1291
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1292 Py_INCREF(ZipImportError);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1293 if (PyModule_AddObject(mod, "ZipImportError",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1294 ZipImportError) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1295 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1296
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1297 Py_INCREF(&ZipImporter_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1298 if (PyModule_AddObject(mod, "zipimporter",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1299 (PyObject *)&ZipImporter_Type) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1300 return NULL;
26931 6c535dcedad3 - added missing decref Just van Rossum <just@letterror.com> parents: 26901 diff changeset	1301
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1302 zip_directory_cache = PyDict_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1303 if (zip_directory_cache == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1304 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1305 Py_INCREF(zip_directory_cache);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1306 if (PyModule_AddObject(mod, "_zip_directory_cache",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1307 zip_directory_cache) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1308 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1309 return mod;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1310 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/zipimport.c @ 78069:a8aa77458e12 3.2