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

annotate Modules/zipimport.c @ 80661:94de77bd0b4b 2.7

Issue #16194: document imp.load_dynamic problems when read several extension modules from the same binary object file.

author	Andrew Svetlov <andrew.svetlov@gmail.com>
date	Thu, 29 Nov 2012 19:51:28 +0200
parents	39e608d462b6
children

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 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	13 char suffix[14];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 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[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	23 {"/__init__.pyc", IS_PACKAGE \| IS_BYTECODE},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	24 {"/__init__.pyo", IS_PACKAGE \| IS_BYTECODE},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	25 {"/__init__.py", IS_PACKAGE \| IS_SOURCE},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	26 {".pyc", IS_BYTECODE},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	27 {".pyo", IS_BYTECODE},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	28 {".py", IS_SOURCE},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 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 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	37 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	38 PyObject archive; / pathname of the Zip archive */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	39 PyObject prefix; / file prefix: "a/sub/directory/" */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	40 PyObject files; / dict with file info {path: toc_entry} */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	41 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	42
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	43 static PyObject *ZipImportError;
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	44 static PyObject *zip_directory_cache = NULL;
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	45
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	46 /* forward decls */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	47 static PyObject read_directory(char archive);
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	48 static PyObject get_data(char archive, PyObject *toc_entry);
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	49 static PyObject get_module_code(ZipImporter self, char *fullname,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	50 int p_ispackage, char *p_modpath);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	51
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	52
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	53 #define ZipImporter_Check(op) PyObject_TypeCheck(op, &ZipImporter_Type)
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 /* zipimporter.__init__
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	57 Split the "subdirectory" from the Zip archive path, lookup a matching
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	58 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	59 if found, or else read it from the archive. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	60 static int
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	61 zipimporter_init(ZipImporter self, PyObject args, PyObject *kwds)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	62 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	63 char path, p, *prefix, buf[MAXPATHLEN+2];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	64 size_t len;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	65
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	66 if (!_PyArg_NoKeywords("zipimporter()", kwds))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	67 return -1;
35450 97c97194e64b Disallow keyword arguments for type constructors that don't use them Georg Brandl <georg@python.org> parents: 33955 diff changeset	68
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	69 if (!PyArg_ParseTuple(args, "s:zipimporter",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	70 &path))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	71 return -1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	72
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	73 len = strlen(path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	74 if (len == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	75 PyErr_SetString(ZipImportError, "archive path is empty");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	76 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	77 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	78 if (len >= MAXPATHLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	79 PyErr_SetString(ZipImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	80 "archive path too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	81 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	82 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	83 strcpy(buf, path);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	84
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	85 #ifdef ALTSEP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	86 for (p = buf; *p; p++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	87 if (*p == ALTSEP)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	88 *p = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	89 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	90 #endif
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	91
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	92 path = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	93 prefix = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	94 for (;;) {
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 28535 diff changeset	95 #ifndef RISCOS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	96 struct stat statbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	97 int rv;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	98
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	99 rv = stat(buf, &statbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	100 if (rv == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	101 /* it exists */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	102 if (S_ISREG(statbuf.st_mode))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	103 /* it's a file */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	104 path = buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	105 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	106 }
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 28535 diff changeset	107 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	108 if (object_exists(buf)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	109 /* it exists */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	110 if (isfile(buf))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	111 /* it's a file */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	112 path = buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	113 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	114 }
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 28535 diff changeset	115 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	116 /* back up one path element */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	117 p = strrchr(buf, SEP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	118 if (prefix != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	119 *prefix = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	120 if (p == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	121 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	122 *p = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	123 prefix = p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	124 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	125 if (path != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	126 PyObject *files;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	127 files = PyDict_GetItemString(zip_directory_cache, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	128 if (files == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	129 files = read_directory(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	130 if (files == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	131 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	132 if (PyDict_SetItemString(zip_directory_cache, path,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	133 files) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	134 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	135 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	136 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	137 Py_INCREF(files);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	138 self->files = files;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	139 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	140 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	141 PyErr_SetString(ZipImportError, "not a Zip file");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	142 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	143 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	144
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	145 if (prefix == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	146 prefix = "";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	147 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	148 prefix++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	149 len = strlen(prefix);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	150 if (prefix[len-1] != SEP) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	151 /* add trailing SEP */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	152 prefix[len] = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	153 prefix[len + 1] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	154 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	155 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	156
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	157 self->archive = PyString_FromString(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	158 if (self->archive == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	159 return -1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	160
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	161 self->prefix = PyString_FromString(prefix);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	162 if (self->prefix == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	163 return -1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	164
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	165 return 0;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	166 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	167
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	168 /* GC support. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	169 static int
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	170 zipimporter_traverse(PyObject obj, visitproc visit, void arg)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	171 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	172 ZipImporter self = (ZipImporter )obj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	173 Py_VISIT(self->files);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	174 return 0;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	175 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	176
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	177 static void
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	178 zipimporter_dealloc(ZipImporter *self)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	179 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	180 PyObject_GC_UnTrack(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	181 Py_XDECREF(self->archive);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	182 Py_XDECREF(self->prefix);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	183 Py_XDECREF(self->files);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	184 Py_TYPE(self)->tp_free((PyObject *)self);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	185 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	186
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	187 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	188 zipimporter_repr(ZipImporter *self)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	189 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	190 char buf[500];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	191 char *archive = "???";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	192 char *prefix = "";
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	193
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	194 if (self->archive != NULL && PyString_Check(self->archive))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	195 archive = PyString_AsString(self->archive);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	196 if (self->prefix != NULL && PyString_Check(self->prefix))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	197 prefix = PyString_AsString(self->prefix);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	198 if (prefix != NULL && *prefix)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	199 PyOS_snprintf(buf, sizeof(buf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	200 "<zipimporter object \"%.300s%c%.150s\">",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	201 archive, SEP, prefix);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	202 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	203 PyOS_snprintf(buf, sizeof(buf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	204 "<zipimporter object \"%.300s\">",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	205 archive);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	206 return PyString_FromString(buf);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	207 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	208
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	209 /* return fullname.split(".")[-1] */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	210 static char *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	211 get_subname(char *fullname)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	212 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	213 char *subname = strrchr(fullname, '.');
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	214 if (subname == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	215 subname = fullname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	216 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	217 subname++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	218 return subname;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	219 }
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 /* Given a (sub)modulename, write the potential file path in the
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	222 archive (without extension) to the path buffer. Return the
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	223 length of the resulting string. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	224 static int
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	225 make_filename(char prefix, char name, char *path)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	226 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	227 size_t len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	228 char *p;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	229
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	230 len = strlen(prefix);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	231
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	232 /* self.prefix + name [+ SEP + "__init__"] + ".py[co]" */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	233 if (len + strlen(name) + 13 >= MAXPATHLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	234 PyErr_SetString(ZipImportError, "path too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	235 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	236 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	237
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	238 strcpy(path, prefix);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	239 strcpy(path + len, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	240 for (p = path + len; *p; p++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	241 if (*p == '.')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	242 *p = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	243 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	244 len += strlen(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	245 assert(len < INT_MAX);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	246 return (int)len;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	247 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	248
33955 77b1c15174b4 SF patch 1062495: Modules/zipimport.c does not compile on solaris Raymond Hettinger <python@rcn.com> parents: 30365 diff changeset	249 enum zi_module_info {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	250 MI_ERROR,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	251 MI_NOT_FOUND,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	252 MI_MODULE,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	253 MI_PACKAGE
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	254 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	255
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	256 /* 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	257 static enum zi_module_info
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	258 get_module_info(ZipImporter self, char fullname)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	259 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	260 char *subname, path[MAXPATHLEN + 1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	261 int len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	262 struct st_zip_searchorder *zso;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	263
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	264 subname = get_subname(fullname);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	265
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	266 len = make_filename(PyString_AsString(self->prefix), subname, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	267 if (len < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	268 return MI_ERROR;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	269
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	270 for (zso = zip_searchorder; *zso->suffix; zso++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	271 strcpy(path + len, zso->suffix);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	272 if (PyDict_GetItemString(self->files, path) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	273 if (zso->type & IS_PACKAGE)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	274 return MI_PACKAGE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	275 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	276 return MI_MODULE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	277 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	278 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	279 return MI_NOT_FOUND;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	280 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	281
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	282 /* 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	283 'fullname'. Return self if we can, None if we can't. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	284 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	285 zipimporter_find_module(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	286 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	287 ZipImporter self = (ZipImporter )obj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	288 PyObject *path = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	289 char *fullname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	290 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	291
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	292 if (!PyArg_ParseTuple(args, "s\|O:zipimporter.find_module",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	293 &fullname, &path))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	294 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	295
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	296 mi = get_module_info(self, fullname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	297 if (mi == MI_ERROR)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	298 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	299 if (mi == MI_NOT_FOUND) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	300 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	301 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	302 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	303 Py_INCREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	304 return (PyObject *)self;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	305 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	306
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	307 /* Load and return the module named by 'fullname'. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	308 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	309 zipimporter_load_module(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	310 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	311 ZipImporter self = (ZipImporter )obj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	312 PyObject code, mod, *dict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	313 char fullname, modpath;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	314 int ispackage;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	315
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	316 if (!PyArg_ParseTuple(args, "s:zipimporter.load_module",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	317 &fullname))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	318 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	319
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	320 code = get_module_code(self, fullname, &ispackage, &modpath);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	321 if (code == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	322 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	323
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	324 mod = PyImport_AddModule(fullname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	325 if (mod == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	326 Py_DECREF(code);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	327 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	328 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	329 dict = PyModule_GetDict(mod);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	330
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	331 /* mod.__loader__ = self */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	332 if (PyDict_SetItemString(dict, "__loader__", (PyObject *)self) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	333 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	334
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	335 if (ispackage) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	336 /* add __path__ to the module before the code gets
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	337 executed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	338 PyObject pkgpath, fullpath;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	339 char *prefix = PyString_AsString(self->prefix);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	340 char *subname = get_subname(fullname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	341 int err;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	342
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	343 fullpath = PyString_FromFormat("%s%c%s%s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	344 PyString_AsString(self->archive),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	345 SEP,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	346 *prefix ? prefix : "",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	347 subname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	348 if (fullpath == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	349 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	350
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	351 pkgpath = Py_BuildValue("[O]", fullpath);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	352 Py_DECREF(fullpath);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	353 if (pkgpath == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	354 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	355 err = PyDict_SetItemString(dict, "__path__", pkgpath);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	356 Py_DECREF(pkgpath);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	357 if (err != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	358 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	359 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	360 mod = PyImport_ExecCodeModuleEx(fullname, code, modpath);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	361 Py_DECREF(code);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	362 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	363 PySys_WriteStderr("import %s # loaded from Zip %s\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	364 fullname, modpath);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	365 return mod;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	366 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	367 Py_DECREF(code);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	368 Py_DECREF(mod);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	369 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	370 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	371
50162 4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	372 /* Return a string matching __file__ for the named module */
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	373 static PyObject *
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	374 zipimporter_get_filename(PyObject obj, PyObject args)
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	375 {
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	376 ZipImporter self = (ZipImporter )obj;
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	377 PyObject *code;
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	378 char fullname, modpath;
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	379 int ispackage;
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	380
51455 117e152e513a Issue #4512 closeout: Make ZipImport.get_filename() a public method Nick Coghlan <ncoghlan@gmail.com> parents: 50162 diff changeset	381 if (!PyArg_ParseTuple(args, "s:zipimporter.get_filename",
50162 4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	382 &fullname))
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	383 return NULL;
50162 4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	384
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	385 /* Deciding the filename requires working out where the code
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	386 would come from if the module was actually loaded */
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	387 code = get_module_code(self, fullname, &ispackage, &modpath);
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	388 if (code == NULL)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	389 return NULL;
50162 4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	390 Py_DECREF(code); /* Only need the path info */
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	391
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	392 return PyString_FromString(modpath);
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	393 }
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	394
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	395 /* 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	396 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	397 zipimporter_is_package(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	398 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	399 ZipImporter self = (ZipImporter )obj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	400 char *fullname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	401 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	402
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	403 if (!PyArg_ParseTuple(args, "s:zipimporter.is_package",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	404 &fullname))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	405 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	406
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	407 mi = get_module_info(self, fullname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	408 if (mi == MI_ERROR)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	409 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	410 if (mi == MI_NOT_FOUND) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	411 PyErr_Format(ZipImportError, "can't find module '%.200s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	412 fullname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	413 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	414 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	415 return PyBool_FromLong(mi == MI_PACKAGE);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	416 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	417
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	418 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	419 zipimporter_get_data(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	420 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	421 ZipImporter self = (ZipImporter )obj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	422 char *path;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	423 #ifdef ALTSEP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	424 char *p, buf[MAXPATHLEN + 1];
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	425 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	426 PyObject *toc_entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	427 Py_ssize_t len;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	428
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	429 if (!PyArg_ParseTuple(args, "s:zipimporter.get_data", &path))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	430 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	431
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	432 #ifdef ALTSEP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	433 if (strlen(path) >= MAXPATHLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	434 PyErr_SetString(ZipImportError, "path too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	435 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	436 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	437 strcpy(buf, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	438 for (p = buf; *p; p++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	439 if (*p == ALTSEP)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	440 *p = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	441 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	442 path = buf;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	443 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	444 len = PyString_Size(self->archive);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	445 if ((size_t)len < strlen(path) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	446 strncmp(path, PyString_AsString(self->archive), len) == 0 &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	447 path[len] == SEP) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	448 path = path + len + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	449 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	450
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	451 toc_entry = PyDict_GetItemString(self->files, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	452 if (toc_entry == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	453 PyErr_SetFromErrnoWithFilename(PyExc_IOError, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	454 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	455 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	456 return get_data(PyString_AsString(self->archive), toc_entry);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	457 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	458
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	459 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	460 zipimporter_get_code(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	461 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	462 ZipImporter self = (ZipImporter )obj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	463 char *fullname;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	464
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	465 if (!PyArg_ParseTuple(args, "s:zipimporter.get_code", &fullname))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	466 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	467
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	468 return get_module_code(self, fullname, NULL, NULL);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	469 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	470
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	471 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	472 zipimporter_get_source(PyObject obj, PyObject args)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	473 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	474 ZipImporter self = (ZipImporter )obj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	475 PyObject *toc_entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	476 char fullname, subname, path[MAXPATHLEN+1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	477 int len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	478 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	479
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	480 if (!PyArg_ParseTuple(args, "s:zipimporter.get_source", &fullname))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	481 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	482
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	483 mi = get_module_info(self, fullname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	484 if (mi == MI_ERROR)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	485 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	486 if (mi == MI_NOT_FOUND) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	487 PyErr_Format(ZipImportError, "can't find module '%.200s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	488 fullname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	489 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	490 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	491 subname = get_subname(fullname);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	492
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	493 len = make_filename(PyString_AsString(self->prefix), subname, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	494 if (len < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	495 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	496
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	497 if (mi == MI_PACKAGE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	498 path[len] = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	499 strcpy(path + len + 1, "__init__.py");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	500 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	501 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	502 strcpy(path + len, ".py");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	503
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	504 toc_entry = PyDict_GetItemString(self->files, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	505 if (toc_entry != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	506 return get_data(PyString_AsString(self->archive), toc_entry);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	507
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	508 /* we have the module, but no source */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	509 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	510 return Py_None;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	511 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	512
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	513 PyDoc_STRVAR(doc_find_module,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	514 "find_module(fullname, path=None) -> self or None.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	515 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	516 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	517 fully qualified (dotted) module name. It returns the zipimporter\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	518 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	519 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	520 with the importer protocol.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	521
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	522 PyDoc_STRVAR(doc_load_module,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	523 "load_module(fullname) -> module.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	524 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	525 Load the module specified by 'fullname'. 'fullname' must be the\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	526 fully qualified (dotted) module name. It returns the imported\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	527 module, or raises ZipImportError if it wasn't found.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	528
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	529 PyDoc_STRVAR(doc_get_data,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	530 "get_data(pathname) -> string with file data.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	531 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	532 Return the data associated with 'pathname'. Raise IOError if\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	533 the file wasn't found.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	534
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	535 PyDoc_STRVAR(doc_is_package,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	536 "is_package(fullname) -> bool.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	537 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	538 Return True if the module specified by fullname is a package.\n\
63116 d0ba3b8b0d48 Merged revisions 83007 via svnmerge from Brian Curtin <brian.curtin@gmail.com> parents: 61465 diff changeset	539 Raise ZipImportError if the module couldn't be found.");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	540
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	541 PyDoc_STRVAR(doc_get_code,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	542 "get_code(fullname) -> code object.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	543 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	544 Return the code object for the specified module. Raise ZipImportError\n\
63116 d0ba3b8b0d48 Merged revisions 83007 via svnmerge from Brian Curtin <brian.curtin@gmail.com> parents: 61465 diff changeset	545 if the module couldn't be found.");
26885 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_get_source,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	548 "get_source(fullname) -> source string.\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 Return the source code for the specified module. Raise ZipImportError\n\
63116 d0ba3b8b0d48 Merged revisions 83007 via svnmerge from Brian Curtin <brian.curtin@gmail.com> parents: 61465 diff changeset	551 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	552 contain the module, but has no source for it.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	553
50162 4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	554
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	555 PyDoc_STRVAR(doc_get_filename,
51455 117e152e513a Issue #4512 closeout: Make ZipImport.get_filename() a public method Nick Coghlan <ncoghlan@gmail.com> parents: 50162 diff changeset	556 "get_filename(fullname) -> filename string.\n\
50162 4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	557 \n\
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	558 Return the filename for the specified module.");
4264cf00a75c Merged revisions 67750-67751 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	559
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	560 static PyMethodDef zipimporter_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	561 {"find_module", zipimporter_find_module, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	562 doc_find_module},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	563 {"load_module", zipimporter_load_module, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	564 doc_load_module},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	565 {"get_data", zipimporter_get_data, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	566 doc_get_data},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	567 {"get_code", zipimporter_get_code, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	568 doc_get_code},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	569 {"get_source", zipimporter_get_source, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	570 doc_get_source},
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	571 {"get_filename", zipimporter_get_filename, METH_VARARGS,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	572 doc_get_filename},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	573 {"is_package", zipimporter_is_package, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	574 doc_is_package},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	575 {NULL, NULL} /* sentinel */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	576 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	577
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	578 static PyMemberDef zipimporter_members[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	579 {"archive", T_OBJECT, offsetof(ZipImporter, archive), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	580 {"prefix", T_OBJECT, offsetof(ZipImporter, prefix), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	581 {"_files", T_OBJECT, offsetof(ZipImporter, files), READONLY},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	582 {NULL}
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	583 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	584
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	585 PyDoc_STRVAR(zipimporter_doc,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	586 "zipimporter(archivepath) -> zipimporter object\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	587 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	588 Create a new zipimporter instance. 'archivepath' must be a path to\n\
46888 dedce7cb7a5d #1326: document and test zipimporter.archive and zipimporter.prefix. Georg Brandl <georg@python.org> parents: 44736 diff changeset	589 a zipfile, or to a specific path inside a zipfile. For example, it can be\n\
dedce7cb7a5d #1326: document and test zipimporter.archive and zipimporter.prefix. Georg Brandl <georg@python.org> parents: 44736 diff changeset	590 '/tmp/myimport.zip', or '/tmp/myimport.zip/mydirectory', if mydirectory is a\n\
dedce7cb7a5d #1326: document and test zipimporter.archive and zipimporter.prefix. Georg Brandl <georg@python.org> parents: 44736 diff changeset	591 valid directory inside the archive.\n\
dedce7cb7a5d #1326: document and test zipimporter.archive and zipimporter.prefix. Georg Brandl <georg@python.org> parents: 44736 diff changeset	592 \n\
dedce7cb7a5d #1326: document and test zipimporter.archive and zipimporter.prefix. Georg Brandl <georg@python.org> parents: 44736 diff changeset	593 'ZipImportError is raised if 'archivepath' doesn't point to a valid Zip\n\
dedce7cb7a5d #1326: document and test zipimporter.archive and zipimporter.prefix. Georg Brandl <georg@python.org> parents: 44736 diff changeset	594 archive.\n\
dedce7cb7a5d #1326: document and test zipimporter.archive and zipimporter.prefix. Georg Brandl <georg@python.org> parents: 44736 diff changeset	595 \n\
dedce7cb7a5d #1326: document and test zipimporter.archive and zipimporter.prefix. Georg Brandl <georg@python.org> parents: 44736 diff changeset	596 The 'archive' attribute of zipimporter objects contains the name of the\n\
dedce7cb7a5d #1326: document and test zipimporter.archive and zipimporter.prefix. Georg Brandl <georg@python.org> parents: 44736 diff changeset	597 zipfile targeted.");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	598
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	599 #define DEFERRED_ADDRESS(ADDR) 0
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	600
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	601 static PyTypeObject ZipImporter_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	602 PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	603 "zipimport.zipimporter",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	604 sizeof(ZipImporter),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	605 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	606 (destructor)zipimporter_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	607 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	608 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	609 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	610 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	611 (reprfunc)zipimporter_repr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	612 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	613 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	614 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	615 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	616 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	617 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	618 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	619 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	620 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	621 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	622 Py_TPFLAGS_HAVE_GC, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	623 zipimporter_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	624 zipimporter_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	625 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	626 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	627 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	628 0, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	629 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	630 zipimporter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	631 zipimporter_members, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	632 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	633 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	634 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	635 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	636 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	637 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	638 (initproc)zipimporter_init, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	639 PyType_GenericAlloc, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	640 PyType_GenericNew, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	641 PyObject_GC_Del, /* tp_free */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	642 };
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	643
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	644
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	645 /* implementation */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	646
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	647 /* 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	648 4 bytes, encoded as little endian. This partially reimplements
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	649 marshal.c:r_long() */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	650 static long
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	651 get_long(unsigned char *buf) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	652 long x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	653 x = buf[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	654 x \|= (long)buf[1] << 8;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	655 x \|= (long)buf[2] << 16;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	656 x \|= (long)buf[3] << 24;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	657 #if SIZEOF_LONG > 4
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	658 /* Sign extension for 64-bit machines */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	659 x \|= -(x & 0x80000000L);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	660 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	661 return x;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	662 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	663
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	664 /*
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	665 read_directory(archive) -> files dict (new reference)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	666
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	667 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	668 (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	669
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	670 A toc_entry is a tuple:
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	671
35853 2a92d5ce0c0d update busted comment Fred Drake <fdrake@acm.org> parents: 35766 diff changeset	672 (__file__, # value to use for __file__, available for all files
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	673 compress, # compression kind; 0 for uncompressed
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	674 data_size, # size of compressed data on disk
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	675 file_size, # size of decompressed data
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	676 file_offset, # offset of file header from start of archive
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	677 time, # mod time of file (in dos format)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	678 date, # mod data of file (in dos format)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	679 crc, # crc checksum of the data
26885 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
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	682 Directories can be recognized by the trailing SEP in the name,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	683 data_size and file_offset are 0.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	684 */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	685 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	686 read_directory(char *archive)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	687 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	688 PyObject *files = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	689 FILE *fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	690 long compress, crc, data_size, file_size, file_offset, date, time;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	691 long header_offset, name_size, header_size, header_position;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	692 long i, l, count;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	693 size_t length;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	694 char path[MAXPATHLEN + 5];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	695 char name[MAXPATHLEN + 5];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	696 char *p, endof_central_dir[22];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	697 long arc_offset; /* offset from beginning of file to start of zip-archive */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	698
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	699 if (strlen(archive) > MAXPATHLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	700 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	701 "Zip path name is too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	702 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	703 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	704 strcpy(path, archive);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	705
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	706 fp = fopen(archive, "rb");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	707 if (fp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	708 PyErr_Format(ZipImportError, "can't open Zip file: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	709 "'%.200s'", archive);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	710 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	711 }
79418 39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	712
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	713 if (fseek(fp, -22, SEEK_END) == -1) {
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	714 fclose(fp);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	715 PyErr_Format(ZipImportError, "can't read Zip file: %s", archive);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	716 return NULL;
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	717 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	718 header_position = ftell(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	719 if (fread(endof_central_dir, 1, 22, fp) != 22) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	720 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	721 PyErr_Format(ZipImportError, "can't read Zip file: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	722 "'%.200s'", archive);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	723 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	724 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	725 if (get_long((unsigned char *)endof_central_dir) != 0x06054B50) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	726 /* Bad: End of Central Dir signature */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	727 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	728 PyErr_Format(ZipImportError, "not a Zip file: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	729 "'%.200s'", archive);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	730 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	731 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	732
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	733 header_size = get_long((unsigned char *)endof_central_dir + 12);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	734 header_offset = get_long((unsigned char *)endof_central_dir + 16);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	735 arc_offset = header_position - header_offset - header_size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	736 header_offset += arc_offset;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	737
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	738 files = PyDict_New();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	739 if (files == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	740 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	741
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	742 length = (long)strlen(path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	743 path[length] = SEP;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	744
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	745 /* Start of Central Directory */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	746 count = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	747 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	748 PyObject *t;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	749 int err;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	750
79418 39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	751 if (fseek(fp, header_offset, 0) == -1) /* Start of file header */
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	752 goto fseek_error;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	753 l = PyMarshal_ReadLongFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	754 if (l != 0x02014B50)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	755 break; /* Bad: Central Dir File Header */
79418 39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	756 if (fseek(fp, header_offset + 10, 0) == -1)
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	757 goto fseek_error;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	758 compress = PyMarshal_ReadShortFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	759 time = PyMarshal_ReadShortFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	760 date = PyMarshal_ReadShortFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	761 crc = PyMarshal_ReadLongFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	762 data_size = PyMarshal_ReadLongFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	763 file_size = PyMarshal_ReadLongFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	764 name_size = PyMarshal_ReadShortFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	765 header_size = 46 + name_size +
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	766 PyMarshal_ReadShortFromFile(fp) +
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	767 PyMarshal_ReadShortFromFile(fp);
79418 39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	768 if (fseek(fp, header_offset + 42, 0) == -1)
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	769 goto fseek_error;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	770 file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	771 if (name_size > MAXPATHLEN)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	772 name_size = MAXPATHLEN;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	773
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	774 p = name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	775 for (i = 0; i < name_size; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	776 *p = (char)getc(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	777 if (*p == '/')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	778 *p = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	779 p++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	780 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	781 p = 0; / Add terminating null byte */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	782 header_offset += header_size;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	783
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	784 strncpy(path + length + 1, name, MAXPATHLEN - length - 1);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	785
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	786 t = Py_BuildValue("siiiiiii", path, compress, data_size,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	787 file_size, file_offset, time, date, crc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	788 if (t == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	789 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	790 err = PyDict_SetItemString(files, name, t);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	791 Py_DECREF(t);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	792 if (err != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	793 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	794 count++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	795 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	796 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	797 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	798 PySys_WriteStderr("# zipimport: found %ld names in %s\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	799 count, archive);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	800 return files;
79418 39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	801 fseek_error:
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	802 fclose(fp);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	803 Py_XDECREF(files);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	804 PyErr_Format(ZipImportError, "can't read Zip file: %s", archive);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	805 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	806 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	807 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	808 Py_XDECREF(files);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	809 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	810 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	811
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	812 /* 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	813 be imported. The function is cached when found, so subsequent calls
70239 bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	814 don't import zlib again. */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	815 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	816 get_decompress_func(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	817 {
70239 bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	818 static int importing_zlib = 0;
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	819 PyObject *zlib;
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	820 PyObject *decompress;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	821
70239 bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	822 if (importing_zlib != 0)
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	823 /* Someone has a zlib.py[co] in their Zip file;
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	824 let's avoid a stack overflow. */
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	825 return NULL;
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	826 importing_zlib = 1;
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	827 zlib = PyImport_ImportModuleNoBlock("zlib");
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	828 importing_zlib = 0;
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	829 if (zlib != NULL) {
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	830 decompress = PyObject_GetAttrString(zlib,
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	831 "decompress");
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	832 Py_DECREF(zlib);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	833 }
70239 bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	834 else {
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	835 PyErr_Clear();
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	836 decompress = NULL;
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	837 }
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	838 if (Py_VerboseFlag)
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	839 PySys_WriteStderr("# zipimport: zlib %s\n",
bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	840 zlib != NULL ? "available": "UNAVAILABLE");
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	841 return decompress;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	842 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	843
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	844 /* 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	845 data as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	846 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	847 get_data(char archive, PyObject toc_entry)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	848 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	849 PyObject raw_data, data = NULL, *decompress;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	850 char *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	851 FILE *fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	852 int err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	853 Py_ssize_t bytes_read = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	854 long l;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	855 char *datapath;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	856 long compress, data_size, file_size, file_offset;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	857 long time, date, crc;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	858
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	859 if (!PyArg_ParseTuple(toc_entry, "slllllll", &datapath, &compress,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	860 &data_size, &file_size, &file_offset, &time,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	861 &date, &crc)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	862 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	863 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	864
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	865 fp = fopen(archive, "rb");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	866 if (!fp) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	867 PyErr_Format(PyExc_IOError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	868 "zipimport: can not open file %s", archive);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	869 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	870 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	871
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	872 /* Check to make sure the local file header is correct */
79418 39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	873 if (fseek(fp, file_offset, 0) == -1) {
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	874 fclose(fp);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	875 PyErr_Format(ZipImportError, "can't read Zip file: %s", archive);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	876 return NULL;
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	877 }
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	878
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	879 l = PyMarshal_ReadLongFromFile(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	880 if (l != 0x04034B50) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	881 /* Bad: Local File Header */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	882 PyErr_Format(ZipImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	883 "bad local file header in %s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	884 archive);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	885 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	886 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	887 }
79418 39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	888 if (fseek(fp, file_offset + 26, 0) == -1) {
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	889 fclose(fp);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	890 PyErr_Format(ZipImportError, "can't read Zip file: %s", archive);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	891 return NULL;
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	892 }
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	893
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	894 l = 30 + PyMarshal_ReadShortFromFile(fp) +
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	895 PyMarshal_ReadShortFromFile(fp); /* local header size */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	896 file_offset += l; /* Start of file data */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	897
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	898 raw_data = PyString_FromStringAndSize((char *)NULL, compress == 0 ?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	899 data_size : data_size + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	900 if (raw_data == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	901 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	902 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	903 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	904 buf = PyString_AsString(raw_data);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	905
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	906 err = fseek(fp, file_offset, 0);
79418 39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	907 if (err == 0) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	908 bytes_read = fread(buf, 1, data_size, fp);
79418 39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	909 } else {
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	910 fclose(fp);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	911 PyErr_Format(ZipImportError, "can't read Zip file: %s", archive);
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	912 return NULL;
39e608d462b6 Closes #15897: zipimport.c doesn't check return value of fseek() Jesus Cea <jcea@jcea.es> parents: 70239 diff changeset	913 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	914 fclose(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	915 if (err \|\| bytes_read != data_size) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	916 PyErr_SetString(PyExc_IOError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	917 "zipimport: can't read data");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	918 Py_DECREF(raw_data);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	919 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	920 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	921
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	922 if (compress != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	923 buf[data_size] = 'Z'; /* saw this in zipfile.py */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	924 data_size++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	925 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	926 buf[data_size] = '\0';
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	927
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	928 if (compress == 0) /* data is not compressed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	929 return raw_data;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	930
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	931 /* Decompress with zlib */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	932 decompress = get_decompress_func();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	933 if (decompress == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	934 PyErr_SetString(ZipImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	935 "can't decompress data; "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	936 "zlib not available");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	937 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	938 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	939 data = PyObject_CallFunction(decompress, "Oi", raw_data, -15);
70239 bfceb8c8178a Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore Victor Stinner <victor.stinner@haypocalc.com> parents: 68588 diff changeset	940 Py_DECREF(decompress);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	941 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	942 Py_DECREF(raw_data);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	943 return data;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	944 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	945
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	946 /* Lenient date/time comparison function. The precision of the mtime
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	947 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	948 must allow a difference of at most one second. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	949 static int
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	950 eq_mtime(time_t t1, time_t t2)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	951 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	952 time_t d = t1 - t2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	953 if (d < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	954 d = -d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	955 /* dostime only stores even seconds, so be lenient */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	956 return d <= 1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	957 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	958
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	959 /* 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	960 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	961 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	962 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	963 Returns a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	964 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	965 unmarshal_code(char pathname, PyObject data, time_t mtime)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	966 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	967 PyObject *code;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	968 char *buf = PyString_AsString(data);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	969 Py_ssize_t size = PyString_Size(data);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	970
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	971 if (size <= 9) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	972 PyErr_SetString(ZipImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	973 "bad pyc data");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	974 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	975 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	976
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	977 if (get_long((unsigned char *)buf) != PyImport_GetMagicNumber()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	978 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	979 PySys_WriteStderr("# %s has bad magic\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	980 pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	981 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	982 return Py_None; /* signal caller to try alternative */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	983 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	984
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	985 if (mtime != 0 && !eq_mtime(get_long((unsigned char *)buf + 4),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	986 mtime)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	987 if (Py_VerboseFlag)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	988 PySys_WriteStderr("# %s has bad mtime\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	989 pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	990 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	991 return Py_None; /* signal caller to try alternative */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	992 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	993
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	994 code = PyMarshal_ReadObjectFromString(buf + 8, size - 8);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	995 if (code == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	996 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	997 if (!PyCode_Check(code)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	998 Py_DECREF(code);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	999 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1000 "compiled module %.200s is not a code object",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1001 pathname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1002 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1003 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1004 return code;
26885 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
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1007 /* 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	1008 This converts DOS and Mac line endings to Unix line endings.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1009 Also append a trailing "\n" to be compatible with
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1010 PyParser_SimpleParseFile(). Returns a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1011 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1012 normalize_line_endings(PyObject *source)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1013 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1014 char buf, q, *p = PyString_AsString(source);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1015 PyObject *fixed_source;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1016
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1017 if (!p)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1018 return NULL;
39472 8158b4e0c7b9 It's very unlikely, though possible that source is not a string. Verify Neal Norwitz <nnorwitz@gmail.com> parents: 37756 diff changeset	1019
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1020 /* one char extra for trailing \n and one for terminating \0 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1021 buf = (char *)PyMem_Malloc(PyString_Size(source) + 2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1022 if (buf == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1023 PyErr_SetString(PyExc_MemoryError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1024 "zipimport: no memory to allocate "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1025 "source buffer");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1026 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1027 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1028 /* replace "\r\n?" by "\n" */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1029 for (q = buf; *p != '\0'; p++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1030 if (*p == '\r') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1031 *q++ = '\n';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1032 if (*(p + 1) == '\n')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1033 p++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1034 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1035 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1036 q++ = p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1037 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1038 q++ = '\n'; / add trailing \n */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1039 *q = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1040 fixed_source = PyString_FromString(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1041 PyMem_Free(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1042 return fixed_source;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1043 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1044
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1045 /* Given a string buffer containing Python source code, compile it
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1046 return and return a code object as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1047 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1048 compile_source(char pathname, PyObject source)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1049 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1050 PyObject code, fixed_source;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1051
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1052 fixed_source = normalize_line_endings(source);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1053 if (fixed_source == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1054 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1055
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1056 code = Py_CompileString(PyString_AsString(fixed_source), pathname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1057 Py_file_input);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1058 Py_DECREF(fixed_source);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1059 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1060 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1061
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1062 /* 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	1063 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	1064 static time_t
07617d0904a6 Make private function and data static. Neal Norwitz <nnorwitz@gmail.com> parents: 28103 diff changeset	1065 parse_dostime(int dostime, int dosdate)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1066 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1067 struct tm stm;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1068
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1069 memset((void *) &stm, '\0', sizeof(stm));
44736 26a86c29ad60 Coverity issue CID #197 Christian Heimes <christian@cheimes.de> parents: 44439 diff changeset	1070
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1071 stm.tm_sec = (dostime & 0x1f) * 2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1072 stm.tm_min = (dostime >> 5) & 0x3f;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1073 stm.tm_hour = (dostime >> 11) & 0x1f;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1074 stm.tm_mday = dosdate & 0x1f;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1075 stm.tm_mon = ((dosdate >> 5) & 0x0f) - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1076 stm.tm_year = ((dosdate >> 9) & 0x7f) + 80;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1077 stm.tm_isdst = -1; /* wday/yday is ignored */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1078
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1079 return mktime(&stm);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1080 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1081
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1082 /* Given a path to a .pyc or .pyo file in the archive, return the
68588 cd8d3c2d3bce #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 68503 diff changeset	1083 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	1084 is available. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1085 static time_t
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1086 get_mtime_of_source(ZipImporter self, char path)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1087 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1088 PyObject *toc_entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1089 time_t mtime = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1090 Py_ssize_t lastchar = strlen(path) - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1091 char savechar = path[lastchar];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1092 path[lastchar] = '\0'; /* strip 'c' or 'o' from .py[co] /
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1093 toc_entry = PyDict_GetItemString(self->files, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1094 if (toc_entry != NULL && PyTuple_Check(toc_entry) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1095 PyTuple_Size(toc_entry) == 8) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1096 /* fetch the time stamp of the .py file for comparison
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1097 with an embedded pyc time stamp */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1098 int time, date;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1099 time = PyInt_AsLong(PyTuple_GetItem(toc_entry, 5));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1100 date = PyInt_AsLong(PyTuple_GetItem(toc_entry, 6));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1101 mtime = parse_dostime(time, date);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1102 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1103 path[lastchar] = savechar;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1104 return mtime;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1105 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1106
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1107 /* 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	1108 Zip archive as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1109 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1110 get_code_from_data(ZipImporter *self, int ispackage, int isbytecode,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1111 time_t mtime, PyObject *toc_entry)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1112 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1113 PyObject data, code;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1114 char *modpath;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1115 char *archive = PyString_AsString(self->archive);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1116
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1117 if (archive == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1118 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1119
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1120 data = get_data(archive, toc_entry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1121 if (data == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1122 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1123
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1124 modpath = PyString_AsString(PyTuple_GetItem(toc_entry, 0));
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1125
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1126 if (isbytecode) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1127 code = unmarshal_code(modpath, data, mtime);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1128 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1129 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1130 code = compile_source(modpath, data);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1131 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1132 Py_DECREF(data);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1133 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1134 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1135
68503 ee5350f1d0c2 #11515: fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 68256 diff changeset	1136 /* Get the code object associated with the module specified by
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1137 'fullname'. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1138 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1139 get_module_code(ZipImporter self, char fullname,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1140 int p_ispackage, char *p_modpath)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1141 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1142 PyObject *toc_entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1143 char *subname, path[MAXPATHLEN + 1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1144 int len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1145 struct st_zip_searchorder *zso;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1146
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1147 subname = get_subname(fullname);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1148
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1149 len = make_filename(PyString_AsString(self->prefix), subname, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1150 if (len < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1151 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1152
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1153 for (zso = zip_searchorder; *zso->suffix; zso++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1154 PyObject *code = NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1155
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1156 strcpy(path + len, zso->suffix);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1157 if (Py_VerboseFlag > 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1158 PySys_WriteStderr("# trying %s%c%s\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1159 PyString_AsString(self->archive),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1160 SEP, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1161 toc_entry = PyDict_GetItemString(self->files, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1162 if (toc_entry != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1163 time_t mtime = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1164 int ispackage = zso->type & IS_PACKAGE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1165 int isbytecode = zso->type & IS_BYTECODE;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1166
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1167 if (isbytecode)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1168 mtime = get_mtime_of_source(self, path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1169 if (p_ispackage != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1170 *p_ispackage = ispackage;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1171 code = get_code_from_data(self, ispackage,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1172 isbytecode, mtime,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1173 toc_entry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1174 if (code == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1175 /* bad magic number or non-matching mtime
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1176 in byte code, try next */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1177 Py_DECREF(code);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1178 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1179 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1180 if (code != NULL && p_modpath != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1181 *p_modpath = PyString_AsString(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1182 PyTuple_GetItem(toc_entry, 0));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1183 return code;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1184 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1185 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1186 PyErr_Format(ZipImportError, "can't find module '%.200s'", fullname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1187 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1188 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1189
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 /* Module init */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1192
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1193 PyDoc_STRVAR(zipimport_doc,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1194 "zipimport provides support for importing Python modules from Zip archives.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1195 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1196 This module exports three objects:\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1197 - 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	1198 - ZipImportError: exception raised by zipimporter objects. It's a\n\
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1199 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	1200 - _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	1201 info dicts, as used in zipimporter._files.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1202 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1203 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	1204 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	1205 to Zip archives.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1206
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1207 PyMODINIT_FUNC
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1208 initzipimport(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1209 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1210 PyObject *mod;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1211
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1212 if (PyType_Ready(&ZipImporter_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1213 return;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1214
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1215 /* Correct directory separator */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1216 zip_searchorder[0].suffix[0] = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1217 zip_searchorder[1].suffix[0] = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1218 zip_searchorder[2].suffix[0] = SEP;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1219 if (Py_OptimizeFlag) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1220 /* Reverse .pyc and .pyo */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1221 struct st_zip_searchorder tmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1222 tmp = zip_searchorder[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1223 zip_searchorder[0] = zip_searchorder[1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1224 zip_searchorder[1] = tmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1225 tmp = zip_searchorder[3];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1226 zip_searchorder[3] = zip_searchorder[4];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1227 zip_searchorder[4] = tmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1228 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1229
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1230 mod = Py_InitModule4("zipimport", NULL, zipimport_doc,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1231 NULL, PYTHON_API_VERSION);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1232 if (mod == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1233 return;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1234
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1235 ZipImportError = PyErr_NewException("zipimport.ZipImportError",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1236 PyExc_ImportError, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1237 if (ZipImportError == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1238 return;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1239
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1240 Py_INCREF(ZipImportError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1241 if (PyModule_AddObject(mod, "ZipImportError",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1242 ZipImportError) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1243 return;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1244
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1245 Py_INCREF(&ZipImporter_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1246 if (PyModule_AddObject(mod, "zipimporter",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1247 (PyObject *)&ZipImporter_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1248 return;
26931 6c535dcedad3 - added missing decref Just van Rossum <just@letterror.com> parents: 26901 diff changeset	1249
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1250 zip_directory_cache = PyDict_New();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1251 if (zip_directory_cache == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1252 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1253 Py_INCREF(zip_directory_cache);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1254 if (PyModule_AddObject(mod, "_zip_directory_cache",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1255 zip_directory_cache) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50162 diff changeset	1256 return;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1257 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/zipimport.c @ 80661:94de77bd0b4b 2.7