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

annotate Modules/zipimport.c @ 70817:dd775b1561ba

Fix markup.

author	Georg Brandl <georg@python.org>
date	Tue, 14 Jun 2011 21:09:55 +0200
parents	01f84c4e581e
children	8beaa9a37387

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);
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	52 static PyObject get_module_code(ZipImporter self, PyObject *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] */
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	205 static PyObject *
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	206 get_subname(PyObject *fullname)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	207 {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	208 Py_ssize_t len;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	209 Py_UNICODE *subname;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	210 subname = Py_UNICODE_strrchr(PyUnicode_AS_UNICODE(fullname), '.');
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	211 if (subname == NULL) {
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	212 Py_INCREF(fullname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	213 return fullname;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	214 } else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	215 subname++;
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	216 len = PyUnicode_GET_SIZE(fullname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	217 len -= subname - PyUnicode_AS_UNICODE(fullname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	218 return PyUnicode_FromUnicode(subname, len);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	219 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	220 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	221
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	222 /* Given a (sub)modulename, write the potential file path in the
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	223 archive (without extension) to the path buffer. Return the
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	224 length of the resulting string.
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	225
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	226 return self.prefix + name.replace('.', os.sep) */
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	227 static PyObject*
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	228 make_filename(PyObject prefix, PyObject name)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	229 {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	230 PyObject *pathobj;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	231 Py_UNICODE *p;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	232
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	233 pathobj = PyUnicode_FromUnicode(NULL,
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	234 PyUnicode_GET_SIZE(prefix)
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	235 + PyUnicode_GET_SIZE(name));
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	236 if (pathobj == NULL)
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	237 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	238
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	239 p = PyUnicode_AS_UNICODE(pathobj);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	240
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	241 Py_UNICODE_strcpy(p, PyUnicode_AS_UNICODE(prefix));
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	242 p += PyUnicode_GET_SIZE(prefix);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	243 Py_UNICODE_strcpy(p, PyUnicode_AS_UNICODE(name));
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	244 for (; *p; p++) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	245 if (*p == '.')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	246 *p = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	247 }
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	248 return pathobj;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	249 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	250
33955 77b1c15174b4 SF patch 1062495: Modules/zipimport.c does not compile on solaris Raymond Hettinger <python@rcn.com> parents: 30365 diff changeset	251 enum zi_module_info {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	252 MI_ERROR,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	253 MI_NOT_FOUND,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	254 MI_MODULE,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	255 MI_PACKAGE
26885 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
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	258 /* 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	259 static enum zi_module_info
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	260 get_module_info(ZipImporter self, PyObject fullname)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	261 {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	262 PyObject *subname;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	263 PyObject path, fullpath, *item;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	264 struct st_zip_searchorder *zso;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	265
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	266 subname = get_subname(fullname);
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	267 if (subname == NULL)
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	268 return MI_ERROR;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	269
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	270 path = make_filename(self->prefix, subname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	271 Py_DECREF(subname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	272 if (path == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	273 return MI_ERROR;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	274
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	275 for (zso = zip_searchorder; *zso->suffix; zso++) {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	276 fullpath = PyUnicode_FromFormat("%U%s", path, zso->suffix);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	277 if (fullpath == NULL) {
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	278 Py_DECREF(path);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	279 return MI_ERROR;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	280 }
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	281 item = PyDict_GetItem(self->files, fullpath);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	282 Py_DECREF(fullpath);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	283 if (item != NULL) {
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	284 Py_DECREF(path);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	285 if (zso->type & IS_PACKAGE)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	286 return MI_PACKAGE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	287 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	288 return MI_MODULE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	289 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	290 }
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	291 Py_DECREF(path);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	292 return MI_NOT_FOUND;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	293 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	294
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	295 /* 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	296 'fullname'. Return self if we can, None if we can't. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	297 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	298 zipimporter_find_module(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	299 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	300 ZipImporter self = (ZipImporter )obj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	301 PyObject *path = NULL;
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	302 PyObject *fullname;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	303 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	304
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	305 if (!PyArg_ParseTuple(args, "U\|O:zipimporter.find_module",
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	306 &fullname, &path))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	307 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	308
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	309 mi = get_module_info(self, fullname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	310 if (mi == MI_ERROR)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	311 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	312 if (mi == MI_NOT_FOUND) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	313 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	314 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	315 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	316 Py_INCREF(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	317 return (PyObject *)self;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	318 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	319
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	320 /* Load and return the module named by 'fullname'. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	321 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	322 zipimporter_load_module(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	323 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	324 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	325 PyObject code = NULL, mod, *dict;
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	326 PyObject *fullname;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	327 PyObject *modpath = NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	328 int ispackage;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	329
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	330 if (!PyArg_ParseTuple(args, "U:zipimporter.load_module",
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	331 &fullname))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	332 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	333
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	334 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	335 if (code == NULL)
65517 c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	336 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	337
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	338 mod = PyImport_AddModuleObject(fullname);
65517 c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	339 if (mod == NULL)
c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	340 goto error;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	341 dict = PyModule_GetDict(mod);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	342
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	343 /* mod.__loader__ = self */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	344 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	345 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	346
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	347 if (ispackage) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	348 /* 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	349 executed */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	350 PyObject pkgpath, fullpath;
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	351 PyObject *subname = get_subname(fullname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	352 int err;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	353
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	354 fullpath = PyUnicode_FromFormat("%U%c%U%U",
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	355 self->archive, SEP,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	356 self->prefix, subname);
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	357 Py_DECREF(subname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	358 if (fullpath == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	359 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	360
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	361 pkgpath = Py_BuildValue("[N]", fullpath);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	362 if (pkgpath == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	363 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	364 err = PyDict_SetItemString(dict, "__path__", pkgpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	365 Py_DECREF(pkgpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	366 if (err != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	367 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	368 }
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	369 mod = PyImport_ExecCodeModuleObject(fullname, code, modpath, NULL);
65517 c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	370 Py_CLEAR(code);
c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	371 if (mod == NULL)
c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	372 goto error;
c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	373
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	374 if (Py_VerboseFlag)
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	375 PySys_FormatStderr("import %U # loaded from Zip %U\n",
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	376 fullname, modpath);
68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	377 Py_DECREF(modpath);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	378 return mod;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	379 error:
65517 c72757033d44 zipimporter_load_module() doesn't destroy mod on error Victor Stinner <victor.stinner@haypocalc.com> parents: 65516 diff changeset	380 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	381 Py_XDECREF(modpath);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	382 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	383 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	384
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	385 /* 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	386 static PyObject *
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	387 zipimporter_get_filename(PyObject obj, PyObject args)
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	388 {
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	389 ZipImporter self = (ZipImporter )obj;
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	390 PyObject fullname, code, *modpath;
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	391 int ispackage;
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	392
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	393 if (!PyArg_ParseTuple(args, "U:zipimporter.get_filename",
65533 1a905391e3ed zipimport: document archive encoding; fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65532 diff changeset	394 &fullname))
65514 8f0625954ffa zipimport: fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65398 diff changeset	395 return NULL;
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	396
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	397 /* 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	398 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	399 code = get_module_code(self, fullname, &ispackage, &modpath);
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	400 if (code == NULL)
65514 8f0625954ffa zipimport: fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65398 diff changeset	401 return NULL;
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	402 Py_DECREF(code); /* Only need the path info */
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	403
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	404 return modpath;
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	405 }
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	406
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	407 /* 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	408 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	409 zipimporter_is_package(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	410 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	411 ZipImporter self = (ZipImporter )obj;
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	412 PyObject *fullname;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	413 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	414
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	415 if (!PyArg_ParseTuple(args, "U:zipimporter.is_package",
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	416 &fullname))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	417 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	418
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	419 mi = get_module_info(self, fullname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	420 if (mi == MI_ERROR)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	421 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	422 if (mi == MI_NOT_FOUND) {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	423 PyErr_Format(ZipImportError, "can't find module %R", fullname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	424 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	425 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	426 return PyBool_FromLong(mi == MI_PACKAGE);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	427 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	428
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	429 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	430 zipimporter_get_data(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	431 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	432 ZipImporter self = (ZipImporter )obj;
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	433 PyObject pathobj, key;
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	434 const Py_UNICODE *path;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	435 #ifdef ALTSEP
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	436 Py_UNICODE *p, buf[MAXPATHLEN + 1];
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	437 #endif
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	438 Py_UNICODE *archive;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	439 PyObject *toc_entry;
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	440 Py_ssize_t path_len, len;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	441
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	442 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	443 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	444
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	445 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	446 path = PyUnicode_AS_UNICODE(pathobj);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	447 #ifdef ALTSEP
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	448 if (path_len >= MAXPATHLEN) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	449 PyErr_SetString(ZipImportError, "path too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	450 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	451 }
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	452 Py_UNICODE_strcpy(buf, path);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	453 for (p = buf; *p; p++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	454 if (*p == ALTSEP)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	455 *p = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	456 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	457 path = buf;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	458 #endif
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	459 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	460 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	461 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	462 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	463 path[len] == SEP) {
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	464 path += len + 1;
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	465 path_len -= len + 1;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	466 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	467
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	468 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	469 if (key == NULL)
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	470 return NULL;
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	471 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	472 if (toc_entry == NULL) {
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	473 PyErr_SetFromErrnoWithFilenameObject(PyExc_IOError, key);
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	474 Py_DECREF(key);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	475 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	476 }
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	477 Py_DECREF(key);
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	478 return get_data(self->archive, toc_entry);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	479 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	480
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	481 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	482 zipimporter_get_code(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	483 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	484 ZipImporter self = (ZipImporter )obj;
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	485 PyObject *fullname;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	486
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	487 if (!PyArg_ParseTuple(args, "U:zipimporter.get_code", &fullname))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	488 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	489
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	490 return get_module_code(self, fullname, NULL, NULL);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	491 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	492
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	493 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	494 zipimporter_get_source(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	495 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	496 ZipImporter self = (ZipImporter )obj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	497 PyObject *toc_entry;
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	498 PyObject fullname, subname, path, fullpath;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	499 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	500
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	501 if (!PyArg_ParseTuple(args, "U:zipimporter.get_source", &fullname))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	502 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	503
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	504 mi = get_module_info(self, fullname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	505 if (mi == MI_ERROR)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	506 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	507 if (mi == MI_NOT_FOUND) {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	508 PyErr_Format(ZipImportError, "can't find module %R", fullname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	509 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	510 }
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	511
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	512 subname = get_subname(fullname);
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	513 if (subname == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	514 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	515
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	516 path = make_filename(self->prefix, subname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	517 Py_DECREF(subname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	518 if (path == NULL)
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	519 return NULL;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	520
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	521 if (mi == MI_PACKAGE)
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	522 fullpath = PyUnicode_FromFormat("%U%c__init__.py", path, SEP);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	523 else
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	524 fullpath = PyUnicode_FromFormat("%U.py", path);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	525 Py_DECREF(path);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	526 if (fullpath == NULL)
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	527 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	528
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	529 toc_entry = PyDict_GetItem(self->files, fullpath);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	530 Py_DECREF(fullpath);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	531 if (toc_entry != NULL) {
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	532 PyObject res, bytes;
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	533 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	534 if (bytes == NULL)
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	535 return NULL;
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	536 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	537 PyBytes_GET_SIZE(bytes));
b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	538 Py_DECREF(bytes);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	539 return res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	540 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	541
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	542 /* 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	543 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	544 return Py_None;
26885 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
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	547 PyDoc_STRVAR(doc_find_module,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	548 "find_module(fullname, path=None) -> self or None.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	549 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	550 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	551 fully qualified (dotted) module name. It returns the zipimporter\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	552 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	553 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	554 with the importer protocol.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	555
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	556 PyDoc_STRVAR(doc_load_module,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	557 "load_module(fullname) -> module.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	558 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	559 Load the module specified by 'fullname'. 'fullname' must be the\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	560 fully qualified (dotted) module name. It returns the imported\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	561 module, or raises ZipImportError if it wasn't found.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	562
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	563 PyDoc_STRVAR(doc_get_data,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	564 "get_data(pathname) -> string with file data.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	565 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	566 Return the data associated with 'pathname'. Raise IOError if\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	567 the file wasn't found.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	568
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	569 PyDoc_STRVAR(doc_is_package,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	570 "is_package(fullname) -> bool.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	571 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	572 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	573 Raise ZipImportError if the module couldn't be found.");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	574
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	575 PyDoc_STRVAR(doc_get_code,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	576 "get_code(fullname) -> code object.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	577 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	578 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	579 if the module couldn't be found.");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	580
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	581 PyDoc_STRVAR(doc_get_source,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	582 "get_source(fullname) -> source string.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	583 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	584 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	585 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	586 contain the module, but has no source for it.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	587
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	588
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	589 PyDoc_STRVAR(doc_get_filename,
51456 74d196c542f7 Merged revisions 69425 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 51271 diff changeset	590 "get_filename(fullname) -> filename string.\n\
50164 252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	591 \n\
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	592 Return the filename for the specified module.");
252927a2f32d Merged revisions 67753 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49051 diff changeset	593
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	594 static PyMethodDef zipimporter_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	595 {"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	596 doc_find_module},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	597 {"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	598 doc_load_module},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	599 {"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	600 doc_get_data},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	601 {"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	602 doc_get_code},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	603 {"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	604 doc_get_source},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	605 {"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	606 doc_get_filename},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	607 {"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	608 doc_is_package},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	609 {NULL, NULL} /* sentinel */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	610 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	611
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	612 static PyMemberDef zipimporter_members[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	613 {"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	614 {"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	615 {"_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	616 {NULL}
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	617 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	618
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	619 PyDoc_STRVAR(zipimporter_doc,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	620 "zipimporter(archivepath) -> zipimporter object\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	621 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	622 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	623 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	624 '/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	625 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	626 \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	627 '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	628 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	629 \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	630 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	631 zipfile targeted.");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	632
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	633 #define DEFERRED_ADDRESS(ADDR) 0
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	634
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	635 static PyTypeObject ZipImporter_Type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	636 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	637 "zipimport.zipimporter",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	638 sizeof(ZipImporter),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	639 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	640 (destructor)zipimporter_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	641 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	642 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	643 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	644 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	645 (reprfunc)zipimporter_repr, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	646 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	647 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	648 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	649 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	650 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	651 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	652 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	653 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	654 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	655 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	656 Py_TPFLAGS_HAVE_GC, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	657 zipimporter_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	658 zipimporter_traverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	659 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	660 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	661 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	662 0, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	663 0, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	664 zipimporter_methods, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	665 zipimporter_members, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	666 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	667 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	668 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	669 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	670 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	671 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	672 (initproc)zipimporter_init, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	673 PyType_GenericAlloc, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	674 PyType_GenericNew, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	675 PyObject_GC_Del, /* tp_free */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	676 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	677
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	678
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	679 /* implementation */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	680
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	681 /* 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	682 4 bytes, encoded as little endian. This partially reimplements
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	683 marshal.c:r_long() */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	684 static long
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	685 get_long(unsigned char *buf) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	686 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	687 x = buf[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	688 x \|= (long)buf[1] << 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	689 x \|= (long)buf[2] << 16;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	690 x \|= (long)buf[3] << 24;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	691 #if SIZEOF_LONG > 4
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	692 /* Sign extension for 64-bit machines */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	693 x \|= -(x & 0x80000000L);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	694 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	695 return x;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	696 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	697
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	698 /*
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	699 read_directory(archive) -> files dict (new reference)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	700
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	701 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	702 (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	703
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	704 A toc_entry is a tuple:
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	705
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	706 (__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	707 # encoded to the filesystem encoding
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	708 compress, # compression kind; 0 for uncompressed
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	709 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	710 file_size, # size of decompressed data
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	711 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	712 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	713 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	714 crc, # crc checksum of the data
65514 8f0625954ffa zipimport: fix indentation Victor Stinner <victor.stinner@haypocalc.com> parents: 65398 diff changeset	715 )
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	716
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	717 Directories can be recognized by the trailing SEP in the name,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	718 data_size and file_offset are 0.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	719 */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	720 static PyObject *
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	721 read_directory(PyObject *archive)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	722 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	723 PyObject *files = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	724 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	725 unsigned short flags;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	726 long compress, crc, data_size, file_size, file_offset, date, time;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	727 long header_offset, name_size, header_size, header_position;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	728 long i, l, count;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	729 size_t length;
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	730 Py_UNICODE path[MAXPATHLEN + 5];
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	731 char name[MAXPATHLEN + 5];
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	732 PyObject *nameobj = NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	733 char *p, endof_central_dir[22];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	734 long arc_offset; /* offset from beginning of file to start of zip-archive */
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	735 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	736 const char *charset;
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	737 int bootstrap;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	738
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	739 if (PyUnicode_GET_SIZE(archive) > MAXPATHLEN) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	740 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	741 "Zip path name is too long");
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 }
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	744 Py_UNICODE_strcpy(path, PyUnicode_AS_UNICODE(archive));
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	745
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	746 fp = _Py_fopen(archive, "rb");
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	747 if (fp == NULL) {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	748 PyErr_Format(ZipImportError, "can't open Zip file: %R", archive);
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 fseek(fp, -22, SEEK_END);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	752 header_position = ftell(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	753 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	754 fclose(fp);
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	755 PyErr_Format(ZipImportError, "can't read Zip file: %R", archive);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	756 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	757 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	758 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	759 /* Bad: End of Central Dir signature */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	760 fclose(fp);
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	761 PyErr_Format(ZipImportError, "not a Zip file: %R", archive);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	762 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	763 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	764
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	765 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	766 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	767 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	768 header_offset += arc_offset;
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 files = PyDict_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	771 if (files == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	772 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	773
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	774 length = Py_UNICODE_strlen(path);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	775 path[length] = SEP;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	776
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	777 /* Start of Central Directory */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	778 count = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	779 for (;;) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	780 PyObject *t;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	781 int err;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	782
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	783 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	784 l = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	785 if (l != 0x02014B50)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	786 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	787 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	788 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	789 compress = PyMarshal_ReadShortFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	790 time = PyMarshal_ReadShortFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	791 date = PyMarshal_ReadShortFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	792 crc = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	793 data_size = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	794 file_size = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	795 name_size = PyMarshal_ReadShortFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	796 header_size = 46 + name_size +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	797 PyMarshal_ReadShortFromFile(fp) +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	798 PyMarshal_ReadShortFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	799 fseek(fp, header_offset + 42, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	800 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	801 if (name_size > MAXPATHLEN)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	802 name_size = MAXPATHLEN;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	803
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	804 p = name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	805 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	806 *p = (char)getc(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	807 if (*p == '/')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	808 *p = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	809 p++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	810 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	811 p = 0; / Add terminating null byte */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	812 header_offset += header_size;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	813
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	814 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	815 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	816 charset = "utf-8";
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	817 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	818 /* 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	819 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	820 in Python in the encodings package.
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	821
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	822 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	823 the encodings module is ASCII-only. */
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	824 charset = "ascii";
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	825 bootstrap = 1;
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	826 }
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	827 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	828 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	829 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	830 if (nameobj == NULL) {
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	831 if (bootstrap)
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	832 PyErr_Format(PyExc_NotImplementedError,
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	833 "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	834 "filenames without the unicode flag",
b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	835 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	836 goto error;
67717 b968053afad0 Issue #10955: zipimport uses ASCII at bootstrap Victor Stinner <victor.stinner@haypocalc.com> parents: 65534 diff changeset	837 }
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	838 Py_UNICODE_strncpy(path + length + 1,
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	839 PyUnicode_AS_UNICODE(nameobj),
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	840 MAXPATHLEN - length - 1);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	841
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	842 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	843 if (pathobj == NULL)
fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	844 goto error;
fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	845 t = Py_BuildValue("Niiiiiii", pathobj, compress, data_size,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	846 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	847 if (t == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	848 goto error;
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	849 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	850 Py_CLEAR(nameobj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	851 Py_DECREF(t);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	852 if (err != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	853 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	854 count++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	855 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	856 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	857 if (Py_VerboseFlag)
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	858 PySys_FormatStderr("# zipimport: found %ld names in %R\n",
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	859 count, archive);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	860 return files;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	861 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	862 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	863 Py_XDECREF(files);
64065 fc89b8deff1e Issue #9425: read_directory() is fully unicode compliant Victor Stinner <victor.stinner@haypocalc.com> parents: 63986 diff changeset	864 Py_XDECREF(nameobj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	865 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	866 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	867
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	868 /* 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	869 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	870 don't import zlib again. */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	871 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	872 get_decompress_func(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	873 {
70214 52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	874 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	875 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	876 PyObject *decompress;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	877
70214 52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	878 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	879 /* 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	880 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	881 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	882 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	883 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	884 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	885 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	886 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	887 "decompress");
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	888 Py_DECREF(zlib);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	889 }
70214 52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	890 else {
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	891 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	892 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	893 }
52d9183b34f8 Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68585 diff changeset	894 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	895 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	896 zlib != NULL ? "available": "UNAVAILABLE");
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	897 return decompress;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	898 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	899
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	900 /* 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	901 data as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	902 static PyObject *
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	903 get_data(PyObject archive, PyObject toc_entry)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	904 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	905 PyObject raw_data, data = NULL, *decompress;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	906 char *buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	907 FILE *fp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	908 int err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	909 Py_ssize_t bytes_read = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	910 long l;
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	911 PyObject *datapath;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	912 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	913 long time, date, crc;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	914
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	915 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	916 &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	917 &date, &crc)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	918 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	919 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	920
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	921 fp = _Py_fopen(archive, "rb");
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	922 if (!fp) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	923 PyErr_Format(PyExc_IOError,
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	924 "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	925 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	926 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	927
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	928 /* 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	929 fseek(fp, file_offset, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	930 l = PyMarshal_ReadLongFromFile(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	931 if (l != 0x04034B50) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	932 /* Bad: Local File Header */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	933 PyErr_Format(ZipImportError,
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	934 "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	935 archive);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	936 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	937 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	938 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	939 fseek(fp, file_offset + 26, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	940 l = 30 + PyMarshal_ReadShortFromFile(fp) +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	941 PyMarshal_ReadShortFromFile(fp); /* local header size */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	942 file_offset += l; /* Start of file data */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	943
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	944 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	945 if (bytes_size == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	946 bytes_size++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	947 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	948
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	949 if (raw_data == NULL) {
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 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	952 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	953 buf = PyBytes_AsString(raw_data);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	954
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	955 err = fseek(fp, file_offset, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	956 if (err == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	957 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	958 fclose(fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	959 if (err \|\| bytes_read != data_size) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	960 PyErr_SetString(PyExc_IOError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	961 "zipimport: can't read data");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	962 Py_DECREF(raw_data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	963 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	964 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	965
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	966 if (compress != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	967 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	968 data_size++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	969 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	970 buf[data_size] = '\0';
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	971
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	972 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	973 data = PyBytes_FromStringAndSize(buf, data_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	974 Py_DECREF(raw_data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	975 return data;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	976 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	977
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	978 /* Decompress with zlib */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	979 decompress = get_decompress_func();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	980 if (decompress == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	981 PyErr_SetString(ZipImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	982 "can't decompress data; "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	983 "zlib not available");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	984 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	985 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	986 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	987 Py_DECREF(decompress);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	988 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	989 Py_DECREF(raw_data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	990 return data;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	991 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	992
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	993 /* Lenient date/time comparison function. The precision of the mtime
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	994 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	995 must allow a difference of at most one second. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	996 static int
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	997 eq_mtime(time_t t1, time_t t2)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	998 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	999 time_t d = t1 - t2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1000 if (d < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1001 d = -d;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1002 /* 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	1003 return d <= 1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1004 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1005
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1006 /* 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	1007 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	1008 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	1009 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	1010 Returns a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1011 static PyObject *
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1012 unmarshal_code(PyObject pathname, PyObject data, time_t mtime)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1013 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1014 PyObject *code;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1015 char *buf = PyBytes_AsString(data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1016 Py_ssize_t size = PyBytes_Size(data);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1017
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1018 if (size <= 9) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1019 PyErr_SetString(ZipImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1020 "bad pyc data");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1021 return NULL;
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 (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	1025 if (Py_VerboseFlag)
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1026 PySys_FormatStderr("# %R has bad magic\n",
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1027 pathname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1028 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1029 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	1030 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1031
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1032 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	1033 mtime)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1034 if (Py_VerboseFlag)
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1035 PySys_FormatStderr("# %R has bad mtime\n",
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1036 pathname);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1037 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1038 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	1039 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1040
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1041 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	1042 if (code == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1043 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1044 if (!PyCode_Check(code)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1045 Py_DECREF(code);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1046 PyErr_Format(PyExc_TypeError,
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1047 "compiled module %R is not a code object",
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1048 pathname);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1049 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1050 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1051 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1052 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1053
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1054 /* 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	1055 This converts DOS and Mac line endings to Unix line endings.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1056 Also append a trailing "\n" to be compatible with
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1057 PyParser_SimpleParseFile(). Returns a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1058 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1059 normalize_line_endings(PyObject *source)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1060 {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1061 char buf, q, *p;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1062 PyObject *fixed_source;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1063 int len = 0;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1064
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1065 p = PyBytes_AsString(source);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1066 if (p == NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1067 return PyBytes_FromStringAndSize("\n\0", 2);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1068 }
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1069
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1070 /* 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	1071 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	1072 if (buf == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1073 PyErr_SetString(PyExc_MemoryError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1074 "zipimport: no memory to allocate "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1075 "source buffer");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1076 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1077 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1078 /* replace "\r\n?" by "\n" */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1079 for (q = buf; *p != '\0'; p++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1080 if (*p == '\r') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1081 *q++ = '\n';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1082 if (*(p + 1) == '\n')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1083 p++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1084 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1085 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1086 q++ = p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1087 len++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1088 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1089 q++ = '\n'; / add trailing \n */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1090 *q = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1091 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	1092 PyMem_Free(buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1093 return fixed_source;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1094 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1095
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1096 /* Given a string buffer containing Python source code, compile it
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1097 return and return a code object as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1098 static PyObject *
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1099 compile_source(PyObject pathname, PyObject source)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1100 {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1101 PyObject code, fixed_source, *pathbytes;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1102
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1103 pathbytes = PyUnicode_EncodeFSDefault(pathname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1104 if (pathbytes == NULL)
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1105 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1106
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1107 fixed_source = normalize_line_endings(source);
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1108 if (fixed_source == NULL) {
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1109 Py_DECREF(pathbytes);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1110 return NULL;
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1111 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1112
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1113 code = Py_CompileString(PyBytes_AsString(fixed_source),
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1114 PyBytes_AsString(pathbytes),
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1115 Py_file_input);
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1116 Py_DECREF(pathbytes);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1117 Py_DECREF(fixed_source);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1118 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1119 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1120
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1121 /* 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	1122 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	1123 static time_t
07617d0904a6 Make private function and data static. Neal Norwitz <nnorwitz@gmail.com> parents: 28103 diff changeset	1124 parse_dostime(int dostime, int dosdate)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1125 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1126 struct tm stm;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1127
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1128 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	1129
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1130 stm.tm_sec = (dostime & 0x1f) * 2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1131 stm.tm_min = (dostime >> 5) & 0x3f;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1132 stm.tm_hour = (dostime >> 11) & 0x1f;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1133 stm.tm_mday = dosdate & 0x1f;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1134 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	1135 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	1136 stm.tm_isdst = -1; /* wday/yday is ignored */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1137
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1138 return mktime(&stm);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1139 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1140
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1141 /* 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	1142 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	1143 is available. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1144 static time_t
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1145 get_mtime_of_source(ZipImporter self, PyObject path)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1146 {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1147 PyObject toc_entry, stripped;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1148 time_t mtime;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1149
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1150 /* strip 'c' or 'o' from .py[co] /
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1151 stripped = PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(path),
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1152 PyUnicode_GET_SIZE(path) - 1);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1153 if (stripped == NULL)
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1154 return (time_t)-1;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1155
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1156 toc_entry = PyDict_GetItem(self->files, stripped);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1157 Py_DECREF(stripped);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1158 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	1159 PyTuple_Size(toc_entry) == 8) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1160 /* 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	1161 with an embedded pyc time stamp */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1162 int time, date;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1163 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	1164 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	1165 mtime = parse_dostime(time, date);
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1166 } else
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1167 mtime = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1168 return mtime;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1169 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1170
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1171 /* 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	1172 Zip archive as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1173 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1174 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	1175 time_t mtime, PyObject *toc_entry)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1176 {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1177 PyObject data, modpath, *code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1178
64090 b662a39f0823 Issue #9425: get_data() uses an unicode path Victor Stinner <victor.stinner@haypocalc.com> parents: 64065 diff changeset	1179 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	1180 if (data == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1181 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1182
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1183 modpath = PyTuple_GetItem(toc_entry, 0);
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	1184 if (isbytecode)
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1185 code = unmarshal_code(modpath, data, mtime);
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	1186 else
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1187 code = compile_source(modpath, data);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1188 Py_DECREF(data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1189 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1190 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1191
68488 0991b40e895d #11515: fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 63117 diff changeset	1192 /* Get the code object associated with the module specified by
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1193 'fullname'. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1194 static PyObject *
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1195 get_module_code(ZipImporter self, PyObject fullname,
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	1196 int p_ispackage, PyObject *p_modpath)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1197 {
70245 812b2326bf47 avoid a compiler warning. the compiler doesn't know that the static Gregory P. Smith <greg@krypto.org> parents: 70216 diff changeset	1198 PyObject code = NULL, toc_entry, *subname;
70398 01f84c4e581e zipimport: initialize fullpath to NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 70245 diff changeset	1199 PyObject path, fullpath = NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1200 struct st_zip_searchorder *zso;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1201
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1202 subname = get_subname(fullname);
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1203 if (subname == NULL)
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1204 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1205
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1206 path = make_filename(self->prefix, subname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1207 Py_DECREF(subname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1208 if (path == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1209 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1210
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1211 for (zso = zip_searchorder; *zso->suffix; zso++) {
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1212 code = NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1213
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1214 fullpath = PyUnicode_FromFormat("%U%s", path, zso->suffix);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1215 if (fullpath == NULL)
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1216 goto exit;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1217
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1218 if (Py_VerboseFlag > 1)
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1219 PySys_FormatStderr("# trying %U%c%U\n",
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1220 self->archive, (int)SEP, fullpath);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1221 toc_entry = PyDict_GetItem(self->files, fullpath);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1222 if (toc_entry != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1223 time_t mtime = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1224 int ispackage = zso->type & IS_PACKAGE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1225 int isbytecode = zso->type & IS_BYTECODE;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1226
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1227 if (isbytecode) {
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1228 mtime = get_mtime_of_source(self, fullpath);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1229 if (mtime == (time_t)-1 && PyErr_Occurred()) {
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1230 goto exit;
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1231 }
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1232 }
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1233 Py_CLEAR(fullpath);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1234 if (p_ispackage != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1235 *p_ispackage = ispackage;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1236 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	1237 isbytecode, mtime,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1238 toc_entry);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1239 if (code == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1240 /* 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	1241 in byte code, try next */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1242 Py_DECREF(code);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1243 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1244 }
65518 68bd75c69db1 zipimport: get_module_code() returns modpath as a Unicode object Victor Stinner <victor.stinner@haypocalc.com> parents: 65517 diff changeset	1245 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	1246 *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	1247 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	1248 }
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1249 goto exit;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1250 }
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1251 else
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1252 Py_CLEAR(fullpath);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1253 }
68709 6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1254 PyErr_Format(ZipImportError, "can't find module %R", fullname);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1255 exit:
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1256 Py_DECREF(path);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1257 Py_XDECREF(fullpath);
6c80ac44ae9c Issue #3080: zipimport has a full unicode suppport Victor Stinner <victor.stinner@haypocalc.com> parents: 68586 diff changeset	1258 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1259 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1260
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1261
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1262 /* Module init */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1263
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1264 PyDoc_STRVAR(zipimport_doc,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1265 "zipimport provides support for importing Python modules from Zip archives.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1266 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1267 This module exports three objects:\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1268 - 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	1269 - ZipImportError: exception raised by zipimporter objects. It's a\n\
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1270 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	1271 - _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	1272 info dicts, as used in zipimporter._files.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1273 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1274 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	1275 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	1276 to Zip archives.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1277
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1278 static struct PyModuleDef zipimportmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1279 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1280 "zipimport",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1281 zipimport_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1282 -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1283 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1284 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1285 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1286 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1287 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1288 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1289
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1290 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	1291 PyInit_zipimport(void)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1292 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1293 PyObject *mod;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1294
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1295 if (PyType_Ready(&ZipImporter_Type) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1296 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1297
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1298 /* Correct directory separator */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1299 zip_searchorder[0].suffix[0] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1300 zip_searchorder[1].suffix[0] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1301 zip_searchorder[2].suffix[0] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1302 if (Py_OptimizeFlag) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1303 /* Reverse .pyc and .pyo */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1304 struct st_zip_searchorder tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1305 tmp = zip_searchorder[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1306 zip_searchorder[0] = zip_searchorder[1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1307 zip_searchorder[1] = tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1308 tmp = zip_searchorder[3];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1309 zip_searchorder[3] = zip_searchorder[4];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1310 zip_searchorder[4] = tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1311 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1312
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1313 mod = PyModule_Create(&zipimportmodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1314 if (mod == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1315 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1316
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1317 ZipImportError = PyErr_NewException("zipimport.ZipImportError",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1318 PyExc_ImportError, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1319 if (ZipImportError == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1320 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1321
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1322 Py_INCREF(ZipImportError);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1323 if (PyModule_AddObject(mod, "ZipImportError",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1324 ZipImportError) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1325 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1326
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1327 Py_INCREF(&ZipImporter_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1328 if (PyModule_AddObject(mod, "zipimporter",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1329 (PyObject *)&ZipImporter_Type) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1330 return NULL;
26931 6c535dcedad3 - added missing decref Just van Rossum <just@letterror.com> parents: 26901 diff changeset	1331
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1332 zip_directory_cache = PyDict_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1333 if (zip_directory_cache == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1334 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1335 Py_INCREF(zip_directory_cache);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1336 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	1337 zip_directory_cache) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1338 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59538 diff changeset	1339 return mod;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1340 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/zipimport.c @ 70817:dd775b1561ba