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

annotate Modules/zipimport.c @ 65035:87f4b32905df 2.7

Cosmetic fix to use print function.

author	Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
date	Fri, 01 Oct 2010 10:48:47 +0000
parents	75af4a27a070
children	b36cb4602e21

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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	13 char suffix[14];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	23 {"/__init__.pyc", IS_PACKAGE \| IS_BYTECODE},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	24 {"/__init__.pyo", IS_PACKAGE \| IS_BYTECODE},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	25 {"/__init__.py", IS_PACKAGE \| IS_SOURCE},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	26 {".pyc", IS_BYTECODE},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	27 {".pyo", IS_BYTECODE},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	28 {".py", IS_SOURCE},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	37 PyObject_HEAD
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	38 PyObject archive; / pathname of the Zip archive */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	39 PyObject prefix; / file prefix: "a/sub/directory/" */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	63 char path, p, *prefix, buf[MAXPATHLEN+2];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	64 size_t len;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	65
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	66 if (!_PyArg_NoKeywords("zipimporter()", kwds))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	69 if (!PyArg_ParseTuple(args, "s:zipimporter",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	70 &path))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	71 return -1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	72
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	73 len = strlen(path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	74 if (len == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	75 PyErr_SetString(ZipImportError, "archive path is empty");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	76 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	77 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	78 if (len >= MAXPATHLEN) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	79 PyErr_SetString(ZipImportError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	80 "archive path too long");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	81 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	82 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	86 for (p = buf; *p; p++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	87 if (*p == ALTSEP)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	88 *p = SEP;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	92 path = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	93 prefix = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	96 struct stat statbuf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	97 int rv;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	98
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	99 rv = stat(buf, &statbuf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	100 if (rv == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	101 /* it exists */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	102 if (S_ISREG(statbuf.st_mode))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	103 /* it's a file */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	104 path = buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	105 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	108 if (object_exists(buf)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	109 /* it exists */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	110 if (isfile(buf))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	111 /* it's a file */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	112 path = buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	113 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	116 /* back up one path element */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	117 p = strrchr(buf, SEP);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	118 if (prefix != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	119 *prefix = SEP;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	120 if (p == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	121 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	122 *p = '\0';
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	123 prefix = p;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	124 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	125 if (path != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	126 PyObject *files;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	127 files = PyDict_GetItemString(zip_directory_cache, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	128 if (files == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	129 files = read_directory(buf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	130 if (files == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	131 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	132 if (PyDict_SetItemString(zip_directory_cache, path,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	133 files) != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	134 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	135 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	136 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	137 Py_INCREF(files);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	138 self->files = files;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	139 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	140 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	141 PyErr_SetString(ZipImportError, "not a Zip file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	142 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	143 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	144
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	145 if (prefix == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	146 prefix = "";
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	147 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	148 prefix++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	149 len = strlen(prefix);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	150 if (prefix[len-1] != SEP) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	151 /* add trailing SEP */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	152 prefix[len] = SEP;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	153 prefix[len + 1] = '\0';
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	154 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	155 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	156
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	157 self->archive = PyString_FromString(buf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	158 if (self->archive == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	159 return -1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	160
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	161 self->prefix = PyString_FromString(prefix);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	162 if (self->prefix == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	163 return -1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	164
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	172 ZipImporter self = (ZipImporter )obj;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	173 Py_VISIT(self->files);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	180 PyObject_GC_UnTrack(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	181 Py_XDECREF(self->archive);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	182 Py_XDECREF(self->prefix);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	183 Py_XDECREF(self->files);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	190 char buf[500];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	191 char *archive = "???";
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	192 char *prefix = "";
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	193
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	194 if (self->archive != NULL && PyString_Check(self->archive))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	195 archive = PyString_AsString(self->archive);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	196 if (self->prefix != NULL && PyString_Check(self->prefix))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	197 prefix = PyString_AsString(self->prefix);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	198 if (prefix != NULL && *prefix)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	199 PyOS_snprintf(buf, sizeof(buf),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	200 "<zipimporter object \"%.300s%c%.150s\">",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	201 archive, SEP, prefix);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	202 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	203 PyOS_snprintf(buf, sizeof(buf),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	204 "<zipimporter object \"%.300s\">",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	205 archive);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	213 char *subname = strrchr(fullname, '.');
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	214 if (subname == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	215 subname = fullname;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	216 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	217 subname++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	227 size_t len;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	228 char *p;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	229
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	230 len = strlen(prefix);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	231
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	232 /* self.prefix + name [+ SEP + "__init__"] + ".py[co]" */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	233 if (len + strlen(name) + 13 >= MAXPATHLEN) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	234 PyErr_SetString(ZipImportError, "path too long");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	235 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	236 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	237
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	238 strcpy(path, prefix);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	239 strcpy(path + len, name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	240 for (p = path + len; *p; p++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	241 if (*p == '.')
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	242 *p = SEP;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	243 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	244 len += strlen(name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	245 assert(len < INT_MAX);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	250 MI_ERROR,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	251 MI_NOT_FOUND,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	252 MI_MODULE,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	260 char *subname, path[MAXPATHLEN + 1];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	261 int len;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	262 struct st_zip_searchorder *zso;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	263
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	264 subname = get_subname(fullname);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	265
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	266 len = make_filename(PyString_AsString(self->prefix), subname, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	267 if (len < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	268 return MI_ERROR;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	269
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	270 for (zso = zip_searchorder; *zso->suffix; zso++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	271 strcpy(path + len, zso->suffix);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	272 if (PyDict_GetItemString(self->files, path) != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	273 if (zso->type & IS_PACKAGE)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	274 return MI_PACKAGE;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	275 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	276 return MI_MODULE;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	277 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	278 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	287 ZipImporter self = (ZipImporter )obj;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	288 PyObject *path = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	289 char *fullname;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	290 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	291
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	292 if (!PyArg_ParseTuple(args, "s\|O:zipimporter.find_module",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	293 &fullname, &path))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	294 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	295
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	296 mi = get_module_info(self, fullname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	297 if (mi == MI_ERROR)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	298 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	299 if (mi == MI_NOT_FOUND) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	300 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	301 return Py_None;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	302 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	303 Py_INCREF(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	311 ZipImporter self = (ZipImporter )obj;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	312 PyObject code, mod, *dict;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	313 char fullname, modpath;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	314 int ispackage;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	315
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	316 if (!PyArg_ParseTuple(args, "s:zipimporter.load_module",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	317 &fullname))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	318 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	319
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	320 code = get_module_code(self, fullname, &ispackage, &modpath);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	321 if (code == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	322 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	323
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	324 mod = PyImport_AddModule(fullname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	325 if (mod == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	326 Py_DECREF(code);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	327 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	328 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	329 dict = PyModule_GetDict(mod);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	330
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	331 /* mod.__loader__ = self */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	332 if (PyDict_SetItemString(dict, "__loader__", (PyObject *)self) != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	333 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	334
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	335 if (ispackage) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	336 /* add __path__ to the module before the code gets
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	337 executed */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	338 PyObject pkgpath, fullpath;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	339 char *prefix = PyString_AsString(self->prefix);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	340 char *subname = get_subname(fullname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	341 int err;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	342
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	343 fullpath = PyString_FromFormat("%s%c%s%s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	344 PyString_AsString(self->archive),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	345 SEP,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	346 *prefix ? prefix : "",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	347 subname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	348 if (fullpath == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	349 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	350
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	351 pkgpath = Py_BuildValue("[O]", fullpath);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	352 Py_DECREF(fullpath);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	353 if (pkgpath == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	354 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	355 err = PyDict_SetItemString(dict, "__path__", pkgpath);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	356 Py_DECREF(pkgpath);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	357 if (err != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	358 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	359 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	360 mod = PyImport_ExecCodeModuleEx(fullname, code, modpath);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	361 Py_DECREF(code);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	362 if (Py_VerboseFlag)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	363 PySys_WriteStderr("import %s # loaded from Zip %s\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	364 fullname, modpath);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	365 return mod;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	366 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	367 Py_DECREF(code);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	368 Py_DECREF(mod);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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))
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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)
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	399 ZipImporter self = (ZipImporter )obj;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	400 char *fullname;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	401 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	402
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	403 if (!PyArg_ParseTuple(args, "s:zipimporter.is_package",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	404 &fullname))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	405 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	406
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	407 mi = get_module_info(self, fullname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	408 if (mi == MI_ERROR)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	409 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	410 if (mi == MI_NOT_FOUND) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	411 PyErr_Format(ZipImportError, "can't find module '%.200s'",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	412 fullname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	413 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	414 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	421 ZipImporter self = (ZipImporter )obj;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	422 char *path;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	423 #ifdef ALTSEP
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	424 char *p, buf[MAXPATHLEN + 1];
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	425 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	426 PyObject *toc_entry;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	427 Py_ssize_t len;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	428
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	429 if (!PyArg_ParseTuple(args, "s:zipimporter.get_data", &path))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	433 if (strlen(path) >= MAXPATHLEN) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	434 PyErr_SetString(ZipImportError, "path too long");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	435 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	436 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	437 strcpy(buf, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	438 for (p = buf; *p; p++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	439 if (*p == ALTSEP)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	440 *p = SEP;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	441 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	442 path = buf;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	443 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	444 len = PyString_Size(self->archive);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	445 if ((size_t)len < strlen(path) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	446 strncmp(path, PyString_AsString(self->archive), len) == 0 &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	447 path[len] == SEP) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	448 path = path + len + 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	449 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	450
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	451 toc_entry = PyDict_GetItemString(self->files, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	452 if (toc_entry == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	453 PyErr_SetFromErrnoWithFilename(PyExc_IOError, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	454 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	455 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	462 ZipImporter self = (ZipImporter )obj;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	463 char *fullname;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	464
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	465 if (!PyArg_ParseTuple(args, "s:zipimporter.get_code", &fullname))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	466 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	467
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	474 ZipImporter self = (ZipImporter )obj;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	475 PyObject *toc_entry;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	476 char fullname, subname, path[MAXPATHLEN+1];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	477 int len;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	478 enum zi_module_info mi;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	479
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	480 if (!PyArg_ParseTuple(args, "s:zipimporter.get_source", &fullname))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	481 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	482
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	483 mi = get_module_info(self, fullname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	484 if (mi == MI_ERROR)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	485 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	486 if (mi == MI_NOT_FOUND) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	487 PyErr_Format(ZipImportError, "can't find module '%.200s'",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	488 fullname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	489 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	490 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	491 subname = get_subname(fullname);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	492
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	493 len = make_filename(PyString_AsString(self->prefix), subname, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	494 if (len < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	495 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	496
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	497 if (mi == MI_PACKAGE) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	498 path[len] = SEP;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	499 strcpy(path + len + 1, "__init__.py");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	500 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	501 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	502 strcpy(path + len, ".py");
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	503
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	504 toc_entry = PyDict_GetItemString(self->files, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	505 if (toc_entry != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	508 /* we have the module, but no source */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	509 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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\
63115 75af4a27a070 Fix #9316. if/is grammar corrections. Brian Curtin <brian.curtin@gmail.com> parents: 61463 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\
63115 75af4a27a070 Fix #9316. if/is grammar corrections. Brian Curtin <brian.curtin@gmail.com> parents: 61463 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\
63115 75af4a27a070 Fix #9316. if/is grammar corrections. Brian Curtin <brian.curtin@gmail.com> parents: 61463 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[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	561 {"find_module", zipimporter_find_module, METH_VARARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	562 doc_find_module},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	563 {"load_module", zipimporter_load_module, METH_VARARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	564 doc_load_module},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	565 {"get_data", zipimporter_get_data, METH_VARARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	566 doc_get_data},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	567 {"get_code", zipimporter_get_code, METH_VARARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	568 doc_get_code},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	569 {"get_source", zipimporter_get_source, METH_VARARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	570 doc_get_source},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	571 {"get_filename", zipimporter_get_filename, METH_VARARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	572 doc_get_filename},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	573 {"is_package", zipimporter_is_package, METH_VARARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	574 doc_is_package},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	579 {"archive", T_OBJECT, offsetof(ZipImporter, archive), READONLY},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	580 {"prefix", T_OBJECT, offsetof(ZipImporter, prefix), READONLY},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	581 {"_files", T_OBJECT, offsetof(ZipImporter, files), READONLY},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	602 PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	603 "zipimport.zipimporter",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	604 sizeof(ZipImporter),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	605 0, /* tp_itemsize */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	606 (destructor)zipimporter_dealloc, /* tp_dealloc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	607 0, /* tp_print */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	608 0, /* tp_getattr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	609 0, /* tp_setattr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	610 0, /* tp_compare */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	611 (reprfunc)zipimporter_repr, /* tp_repr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	612 0, /* tp_as_number */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	613 0, /* tp_as_sequence */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	614 0, /* tp_as_mapping */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	615 0, /* tp_hash */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	616 0, /* tp_call */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	617 0, /* tp_str */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	618 PyObject_GenericGetAttr, /* tp_getattro */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	619 0, /* tp_setattro */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	620 0, /* tp_as_buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	621 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	622 Py_TPFLAGS_HAVE_GC, /* tp_flags */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	623 zipimporter_doc, /* tp_doc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	624 zipimporter_traverse, /* tp_traverse */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	625 0, /* tp_clear */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	626 0, /* tp_richcompare */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	627 0, /* tp_weaklistoffset */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	628 0, /* tp_iter */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	629 0, /* tp_iternext */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	630 zipimporter_methods, /* tp_methods */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	631 zipimporter_members, /* tp_members */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	632 0, /* tp_getset */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	633 0, /* tp_base */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	634 0, /* tp_dict */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	635 0, /* tp_descr_get */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	636 0, /* tp_descr_set */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	637 0, /* tp_dictoffset */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	638 (initproc)zipimporter_init, /* tp_init */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	639 PyType_GenericAlloc, /* tp_alloc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	640 PyType_GenericNew, /* tp_new */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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) {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	652 long x;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	653 x = buf[0];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	654 x \|= (long)buf[1] << 8;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	655 x \|= (long)buf[2] << 16;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	658 /* Sign extension for 64-bit machines */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	659 x \|= -(x & 0x80000000L);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	660 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	673 compress, # compression kind; 0 for uncompressed
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	674 data_size, # size of compressed data on disk
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	675 file_size, # size of decompressed data
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	676 file_offset, # offset of file header from start of archive
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	677 time, # mod time of file (in dos format)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	678 date, # mod data of file (in dos format)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	688 PyObject *files = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	689 FILE *fp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	690 long compress, crc, data_size, file_size, file_offset, date, time;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	691 long header_offset, name_size, header_size, header_position;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	692 long i, l, count;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	693 size_t length;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	694 char path[MAXPATHLEN + 5];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	695 char name[MAXPATHLEN + 5];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	696 char *p, endof_central_dir[22];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 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
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	699 if (strlen(archive) > MAXPATHLEN) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	700 PyErr_SetString(PyExc_OverflowError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	701 "Zip path name is too long");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	702 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	703 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	704 strcpy(path, archive);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	705
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	706 fp = fopen(archive, "rb");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	707 if (fp == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	708 PyErr_Format(ZipImportError, "can't open Zip file: "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	709 "'%.200s'", archive);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	710 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	711 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	712 fseek(fp, -22, SEEK_END);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	713 header_position = ftell(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	714 if (fread(endof_central_dir, 1, 22, fp) != 22) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	715 fclose(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	716 PyErr_Format(ZipImportError, "can't read Zip file: "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	717 "'%.200s'", archive);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	718 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	719 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	720 if (get_long((unsigned char *)endof_central_dir) != 0x06054B50) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	721 /* Bad: End of Central Dir signature */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	722 fclose(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	723 PyErr_Format(ZipImportError, "not a Zip file: "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	724 "'%.200s'", archive);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	725 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	726 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	727
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	728 header_size = get_long((unsigned char *)endof_central_dir + 12);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	729 header_offset = get_long((unsigned char *)endof_central_dir + 16);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	730 arc_offset = header_position - header_offset - header_size;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	731 header_offset += arc_offset;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	732
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	733 files = PyDict_New();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	734 if (files == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	735 goto error;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	736
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	737 length = (long)strlen(path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	738 path[length] = SEP;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	739
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	740 /* Start of Central Directory */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	741 count = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	742 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	743 PyObject *t;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	744 int err;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	745
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	746 fseek(fp, header_offset, 0); /* Start of file header */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	747 l = PyMarshal_ReadLongFromFile(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	748 if (l != 0x02014B50)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	749 break; /* Bad: Central Dir File Header */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	750 fseek(fp, header_offset + 10, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	751 compress = PyMarshal_ReadShortFromFile(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	752 time = PyMarshal_ReadShortFromFile(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	753 date = PyMarshal_ReadShortFromFile(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	754 crc = PyMarshal_ReadLongFromFile(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	755 data_size = PyMarshal_ReadLongFromFile(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	756 file_size = PyMarshal_ReadLongFromFile(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	757 name_size = PyMarshal_ReadShortFromFile(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	758 header_size = 46 + name_size +
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	759 PyMarshal_ReadShortFromFile(fp) +
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	760 PyMarshal_ReadShortFromFile(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	761 fseek(fp, header_offset + 42, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	762 file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	763 if (name_size > MAXPATHLEN)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	764 name_size = MAXPATHLEN;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	765
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	766 p = name;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	767 for (i = 0; i < name_size; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	768 *p = (char)getc(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	769 if (*p == '/')
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	770 *p = SEP;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	771 p++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	772 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	773 p = 0; / Add terminating null byte */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	774 header_offset += header_size;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	775
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	776 strncpy(path + length + 1, name, MAXPATHLEN - length - 1);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	777
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	778 t = Py_BuildValue("siiiiiii", path, compress, data_size,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	779 file_size, file_offset, time, date, crc);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	780 if (t == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	781 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	782 err = PyDict_SetItemString(files, name, t);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	783 Py_DECREF(t);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	784 if (err != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	785 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	786 count++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	787 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	788 fclose(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	789 if (Py_VerboseFlag)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	790 PySys_WriteStderr("# zipimport: found %ld names in %s\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	791 count, archive);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	792 return files;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	793 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	794 fclose(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	795 Py_XDECREF(files);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	796 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	797 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	798
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	799 /* 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	800 be imported. The function is cached when found, so subsequent calls
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	801 don't import zlib again. Returns a borrowed reference.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	802 XXX This makes zlib.decompress immortal. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	803 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	804 get_decompress_func(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	805 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	806 static PyObject *decompress = NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	807
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	808 if (decompress == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	809 PyObject *zlib;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	810 static int importing_zlib = 0;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	811
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	812 if (importing_zlib != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	813 /* Someone has a zlib.py[co] in their Zip file;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	814 let's avoid a stack overflow. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	815 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	816 importing_zlib = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	817 zlib = PyImport_ImportModuleNoBlock("zlib");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	818 importing_zlib = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	819 if (zlib != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	820 decompress = PyObject_GetAttrString(zlib,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	821 "decompress");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	822 Py_DECREF(zlib);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	823 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	824 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	825 PyErr_Clear();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	826 if (Py_VerboseFlag)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	827 PySys_WriteStderr("# zipimport: zlib %s\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	828 zlib != NULL ? "available": "UNAVAILABLE");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	829 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	830 return decompress;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	831 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	832
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	833 /* 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	834 data as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	835 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	836 get_data(char archive, PyObject toc_entry)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	837 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	838 PyObject raw_data, data = NULL, *decompress;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	839 char *buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	840 FILE *fp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	841 int err;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	842 Py_ssize_t bytes_read = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	843 long l;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	844 char *datapath;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	845 long compress, data_size, file_size, file_offset;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	846 long time, date, crc;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	847
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	848 if (!PyArg_ParseTuple(toc_entry, "slllllll", &datapath, &compress,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	849 &data_size, &file_size, &file_offset, &time,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	850 &date, &crc)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	851 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	852 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	853
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	854 fp = fopen(archive, "rb");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	855 if (!fp) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	856 PyErr_Format(PyExc_IOError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	857 "zipimport: can not open file %s", archive);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	858 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	859 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	860
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	861 /* Check to make sure the local file header is correct */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	862 fseek(fp, file_offset, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	863 l = PyMarshal_ReadLongFromFile(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	864 if (l != 0x04034B50) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	865 /* Bad: Local File Header */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	866 PyErr_Format(ZipImportError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	867 "bad local file header in %s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	868 archive);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	869 fclose(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	870 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	871 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	872 fseek(fp, file_offset + 26, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	873 l = 30 + PyMarshal_ReadShortFromFile(fp) +
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	874 PyMarshal_ReadShortFromFile(fp); /* local header size */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	875 file_offset += l; /* Start of file data */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	876
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	877 raw_data = PyString_FromStringAndSize((char *)NULL, compress == 0 ?
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	878 data_size : data_size + 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	879 if (raw_data == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	880 fclose(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	881 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	882 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	883 buf = PyString_AsString(raw_data);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	884
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	885 err = fseek(fp, file_offset, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	886 if (err == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	887 bytes_read = fread(buf, 1, data_size, fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	888 fclose(fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	889 if (err \|\| bytes_read != data_size) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	890 PyErr_SetString(PyExc_IOError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	891 "zipimport: can't read data");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	892 Py_DECREF(raw_data);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	893 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	894 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	895
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	896 if (compress != 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	897 buf[data_size] = 'Z'; /* saw this in zipfile.py */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	898 data_size++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	899 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	900 buf[data_size] = '\0';
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	901
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	902 if (compress == 0) /* data is not compressed */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	903 return raw_data;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	904
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	905 /* Decompress with zlib */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	906 decompress = get_decompress_func();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	907 if (decompress == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	908 PyErr_SetString(ZipImportError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	909 "can't decompress data; "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	910 "zlib not available");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	911 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	912 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	913 data = PyObject_CallFunction(decompress, "Oi", raw_data, -15);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	914 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	915 Py_DECREF(raw_data);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	916 return data;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	917 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	918
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	919 /* Lenient date/time comparison function. The precision of the mtime
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	920 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	921 must allow a difference of at most one second. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	922 static int
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	923 eq_mtime(time_t t1, time_t t2)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	924 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	925 time_t d = t1 - t2;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	926 if (d < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	927 d = -d;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	928 /* dostime only stores even seconds, so be lenient */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	929 return d <= 1;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	930 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	931
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	932 /* 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	933 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	934 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	935 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	936 Returns a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	937 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	938 unmarshal_code(char pathname, PyObject data, time_t mtime)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	939 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	940 PyObject *code;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	941 char *buf = PyString_AsString(data);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	942 Py_ssize_t size = PyString_Size(data);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	943
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	944 if (size <= 9) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	945 PyErr_SetString(ZipImportError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	946 "bad pyc data");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	947 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	948 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	949
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	950 if (get_long((unsigned char *)buf) != PyImport_GetMagicNumber()) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	951 if (Py_VerboseFlag)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	952 PySys_WriteStderr("# %s has bad magic\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	953 pathname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	954 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	955 return Py_None; /* signal caller to try alternative */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	956 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	957
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	958 if (mtime != 0 && !eq_mtime(get_long((unsigned char *)buf + 4),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	959 mtime)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	960 if (Py_VerboseFlag)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	961 PySys_WriteStderr("# %s has bad mtime\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	962 pathname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	963 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	964 return Py_None; /* signal caller to try alternative */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	965 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	966
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	967 code = PyMarshal_ReadObjectFromString(buf + 8, size - 8);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	968 if (code == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	969 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	970 if (!PyCode_Check(code)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	971 Py_DECREF(code);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	972 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	973 "compiled module %.200s is not a code object",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	974 pathname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	975 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	976 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	977 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	978 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	979
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	980 /* 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	981 This converts DOS and Mac line endings to Unix line endings.
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	982 Also append a trailing "\n" to be compatible with
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	983 PyParser_SimpleParseFile(). Returns a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	984 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	985 normalize_line_endings(PyObject *source)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	986 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	987 char buf, q, *p = PyString_AsString(source);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	988 PyObject *fixed_source;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	989
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	990 if (!p)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	991 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	992
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	993 /* one char extra for trailing \n and one for terminating \0 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	994 buf = (char *)PyMem_Malloc(PyString_Size(source) + 2);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	995 if (buf == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	996 PyErr_SetString(PyExc_MemoryError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	997 "zipimport: no memory to allocate "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	998 "source buffer");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	999 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1000 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1001 /* replace "\r\n?" by "\n" */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1002 for (q = buf; *p != '\0'; p++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1003 if (*p == '\r') {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1004 *q++ = '\n';
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1005 if (*(p + 1) == '\n')
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1006 p++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1007 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1008 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1009 q++ = p;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1010 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1011 q++ = '\n'; / add trailing \n */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1012 *q = '\0';
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1013 fixed_source = PyString_FromString(buf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1014 PyMem_Free(buf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1015 return fixed_source;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1016 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1017
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1018 /* Given a string buffer containing Python source code, compile it
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1019 return and return a code object as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1020 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1021 compile_source(char pathname, PyObject source)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1022 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1023 PyObject code, fixed_source;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1024
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1025 fixed_source = normalize_line_endings(source);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1026 if (fixed_source == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1027 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1028
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1029 code = Py_CompileString(PyString_AsString(fixed_source), pathname,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1030 Py_file_input);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1031 Py_DECREF(fixed_source);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1032 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1033 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1034
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1035 /* 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	1036 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	1037 static time_t
07617d0904a6 Make private function and data static. Neal Norwitz <nnorwitz@gmail.com> parents: 28103 diff changeset	1038 parse_dostime(int dostime, int dosdate)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1039 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1040 struct tm stm;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1041
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1042 memset((void *) &stm, '\0', sizeof(stm));
44736 26a86c29ad60 Coverity issue CID #197 Christian Heimes <christian@cheimes.de> parents: 44439 diff changeset	1043
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1044 stm.tm_sec = (dostime & 0x1f) * 2;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1045 stm.tm_min = (dostime >> 5) & 0x3f;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1046 stm.tm_hour = (dostime >> 11) & 0x1f;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1047 stm.tm_mday = dosdate & 0x1f;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1048 stm.tm_mon = ((dosdate >> 5) & 0x0f) - 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1049 stm.tm_year = ((dosdate >> 9) & 0x7f) + 80;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1050 stm.tm_isdst = -1; /* wday/yday is ignored */
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1051
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1052 return mktime(&stm);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1053 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1054
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1055 /* Given a path to a .pyc or .pyo file in the archive, return the
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1056 modifictaion time of the matching .py file, or 0 if no source
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1057 is available. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1058 static time_t
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1059 get_mtime_of_source(ZipImporter self, char path)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1060 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1061 PyObject *toc_entry;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1062 time_t mtime = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1063 Py_ssize_t lastchar = strlen(path) - 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1064 char savechar = path[lastchar];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1065 path[lastchar] = '\0'; /* strip 'c' or 'o' from .py[co] /
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1066 toc_entry = PyDict_GetItemString(self->files, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1067 if (toc_entry != NULL && PyTuple_Check(toc_entry) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1068 PyTuple_Size(toc_entry) == 8) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1069 /* fetch the time stamp of the .py file for comparison
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1070 with an embedded pyc time stamp */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1071 int time, date;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1072 time = PyInt_AsLong(PyTuple_GetItem(toc_entry, 5));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1073 date = PyInt_AsLong(PyTuple_GetItem(toc_entry, 6));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1074 mtime = parse_dostime(time, date);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1075 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1076 path[lastchar] = savechar;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1077 return mtime;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1078 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1079
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1080 /* 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	1081 Zip archive as a new reference. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1082 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1083 get_code_from_data(ZipImporter *self, int ispackage, int isbytecode,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1084 time_t mtime, PyObject *toc_entry)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1085 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1086 PyObject data, code;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1087 char *modpath;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1088 char *archive = PyString_AsString(self->archive);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1089
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1090 if (archive == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1091 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1092
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1093 data = get_data(archive, toc_entry);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1094 if (data == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1095 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1096
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1097 modpath = PyString_AsString(PyTuple_GetItem(toc_entry, 0));
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1098
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1099 if (isbytecode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1100 code = unmarshal_code(modpath, data, mtime);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1101 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1102 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1103 code = compile_source(modpath, data);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1104 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1105 Py_DECREF(data);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1106 return code;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1107 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1108
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1109 /* Get the code object assoiciated with the module specified by
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1110 'fullname'. */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1111 static PyObject *
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1112 get_module_code(ZipImporter self, char fullname,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1113 int p_ispackage, char *p_modpath)
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1114 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1115 PyObject *toc_entry;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1116 char *subname, path[MAXPATHLEN + 1];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1117 int len;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1118 struct st_zip_searchorder *zso;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1119
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1120 subname = get_subname(fullname);
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1121
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1122 len = make_filename(PyString_AsString(self->prefix), subname, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1123 if (len < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1124 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1125
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1126 for (zso = zip_searchorder; *zso->suffix; zso++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1127 PyObject *code = NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1128
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1129 strcpy(path + len, zso->suffix);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1130 if (Py_VerboseFlag > 1)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1131 PySys_WriteStderr("# trying %s%c%s\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1132 PyString_AsString(self->archive),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1133 SEP, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1134 toc_entry = PyDict_GetItemString(self->files, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1135 if (toc_entry != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1136 time_t mtime = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1137 int ispackage = zso->type & IS_PACKAGE;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1138 int isbytecode = zso->type & IS_BYTECODE;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1139
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1140 if (isbytecode)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1141 mtime = get_mtime_of_source(self, path);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1142 if (p_ispackage != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1143 *p_ispackage = ispackage;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1144 code = get_code_from_data(self, ispackage,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1145 isbytecode, mtime,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1146 toc_entry);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1147 if (code == Py_None) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1148 /* bad magic number or non-matching mtime
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1149 in byte code, try next */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1150 Py_DECREF(code);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1151 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1152 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1153 if (code != NULL && p_modpath != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1154 *p_modpath = PyString_AsString(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1155 PyTuple_GetItem(toc_entry, 0));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1156 return code;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1157 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1158 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1159 PyErr_Format(ZipImportError, "can't find module '%.200s'", fullname);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1160 return NULL;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1161 }
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1162
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1163
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1164 /* Module init */
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1165
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1166 PyDoc_STRVAR(zipimport_doc,
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1167 "zipimport provides support for importing Python modules from Zip archives.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1168 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1169 This module exports three objects:\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1170 - 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	1171 - ZipImportError: exception raised by zipimporter objects. It's a\n\
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1172 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	1173 - _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	1174 info dicts, as used in zipimporter._files.\n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1175 \n\
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1176 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	1177 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	1178 to Zip archives.");
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1179
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1180 PyMODINIT_FUNC
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1181 initzipimport(void)
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1182 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1183 PyObject *mod;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1184
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1185 if (PyType_Ready(&ZipImporter_Type) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1186 return;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1187
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1188 /* Correct directory separator */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1189 zip_searchorder[0].suffix[0] = SEP;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1190 zip_searchorder[1].suffix[0] = SEP;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1191 zip_searchorder[2].suffix[0] = SEP;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1192 if (Py_OptimizeFlag) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1193 /* Reverse .pyc and .pyo */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1194 struct st_zip_searchorder tmp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1195 tmp = zip_searchorder[0];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1196 zip_searchorder[0] = zip_searchorder[1];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1197 zip_searchorder[1] = tmp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1198 tmp = zip_searchorder[3];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1199 zip_searchorder[3] = zip_searchorder[4];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1200 zip_searchorder[4] = tmp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1201 }
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1202
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1203 mod = Py_InitModule4("zipimport", NULL, zipimport_doc,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1204 NULL, PYTHON_API_VERSION);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1205 if (mod == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1206 return;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1207
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1208 ZipImportError = PyErr_NewException("zipimport.ZipImportError",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1209 PyExc_ImportError, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1210 if (ZipImportError == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1211 return;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1212
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1213 Py_INCREF(ZipImportError);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1214 if (PyModule_AddObject(mod, "ZipImportError",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1215 ZipImportError) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1216 return;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1217
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1218 Py_INCREF(&ZipImporter_Type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1219 if (PyModule_AddObject(mod, "zipimporter",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1220 (PyObject *)&ZipImporter_Type) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1221 return;
26931 6c535dcedad3 - added missing decref Just van Rossum <just@letterror.com> parents: 26901 diff changeset	1222
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1223 zip_directory_cache = PyDict_New();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1224 if (zip_directory_cache == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1225 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1226 Py_INCREF(zip_directory_cache);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1227 if (PyModule_AddObject(mod, "_zip_directory_cache",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1228 zip_directory_cache) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 51455 diff changeset	1229 return;
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: diff changeset	1230 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/zipimport.c @ 65035:87f4b32905df 2.7