Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1 | #include "Python.h" |
Benjamin Peterson | 42aa93b | 2017-12-09 10:26:52 -0800 | [diff] [blame] | 2 | #include "internal/import.h" |
Eric Snow | 2ebc5ce | 2017-09-07 23:51:28 -0600 | [diff] [blame] | 3 | #include "internal/pystate.h" |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 4 | #include "structmember.h" |
| 5 | #include "osdefs.h" |
| 6 | #include "marshal.h" |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 7 | #include <time.h> |
| 8 | |
| 9 | |
| 10 | #define IS_SOURCE 0x0 |
| 11 | #define IS_BYTECODE 0x1 |
| 12 | #define IS_PACKAGE 0x2 |
| 13 | |
| 14 | struct st_zip_searchorder { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 15 | char suffix[14]; |
| 16 | int type; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 17 | }; |
| 18 | |
Victor Stinner | 651f9f7 | 2013-11-12 21:44:18 +0100 | [diff] [blame] | 19 | #ifdef ALTSEP |
| 20 | _Py_IDENTIFIER(replace); |
| 21 | #endif |
| 22 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 23 | /* zip_searchorder defines how we search for a module in the Zip |
| 24 | archive: we first search for a package __init__, then for |
Brett Cannon | f299abd | 2015-04-13 14:21:02 -0400 | [diff] [blame] | 25 | non-package .pyc, and .py entries. The .pyc entries |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 26 | are swapped by initzipimport() if we run in optimized mode. Also, |
| 27 | '/' is replaced by SEP there. */ |
Neal Norwitz | 29fd2ba | 2003-03-23 13:21:03 +0000 | [diff] [blame] | 28 | static struct st_zip_searchorder zip_searchorder[] = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 29 | {"/__init__.pyc", IS_PACKAGE | IS_BYTECODE}, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 30 | {"/__init__.py", IS_PACKAGE | IS_SOURCE}, |
| 31 | {".pyc", IS_BYTECODE}, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 32 | {".py", IS_SOURCE}, |
| 33 | {"", 0} |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 34 | }; |
| 35 | |
| 36 | /* zipimporter object definition and support */ |
| 37 | |
| 38 | typedef struct _zipimporter ZipImporter; |
| 39 | |
| 40 | struct _zipimporter { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 41 | PyObject_HEAD |
Victor Stinner | 9e40fad | 2010-10-18 22:34:46 +0000 | [diff] [blame] | 42 | PyObject *archive; /* pathname of the Zip archive, |
| 43 | decoded from the filesystem encoding */ |
Victor Stinner | 72f767e | 2010-10-18 11:44:21 +0000 | [diff] [blame] | 44 | PyObject *prefix; /* file prefix: "a/sub/directory/", |
| 45 | encoded to the filesystem encoding */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 46 | PyObject *files; /* dict with file info {path: toc_entry} */ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 47 | }; |
| 48 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 49 | static PyObject *ZipImportError; |
Victor Stinner | c342fca | 2010-10-18 11:39:05 +0000 | [diff] [blame] | 50 | /* read_directory() cache */ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 51 | static PyObject *zip_directory_cache = NULL; |
| 52 | |
| 53 | /* forward decls */ |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 54 | static PyObject *read_directory(PyObject *archive); |
| 55 | static PyObject *get_data(PyObject *archive, PyObject *toc_entry); |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 56 | static PyObject *get_module_code(ZipImporter *self, PyObject *fullname, |
Victor Stinner | 08654e1 | 2010-10-18 12:09:02 +0000 | [diff] [blame] | 57 | int *p_ispackage, PyObject **p_modpath); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 58 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 59 | static PyTypeObject ZipImporter_Type; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 60 | |
| 61 | #define ZipImporter_Check(op) PyObject_TypeCheck(op, &ZipImporter_Type) |
| 62 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 63 | /*[clinic input] |
| 64 | module zipimport |
| 65 | class zipimport.zipimporter "ZipImporter *" "&ZipImporter_Type" |
| 66 | [clinic start generated code]*/ |
| 67 | /*[clinic end generated code: output=da39a3ee5e6b4b0d input=9db8b61557d911e7]*/ |
| 68 | #include "clinic/zipimport.c.h" |
| 69 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 70 | |
| 71 | /* zipimporter.__init__ |
| 72 | Split the "subdirectory" from the Zip archive path, lookup a matching |
| 73 | entry in sys.path_importer_cache, fetch the file directory from there |
| 74 | if found, or else read it from the archive. */ |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 75 | |
| 76 | /*[clinic input] |
| 77 | zipimport.zipimporter.__init__ |
| 78 | |
| 79 | archivepath as path: object(converter="PyUnicode_FSDecoder") |
| 80 | A path-like object to a zipfile, or to a specific path inside |
| 81 | a zipfile. |
| 82 | / |
| 83 | |
| 84 | Create a new zipimporter instance. |
| 85 | |
| 86 | 'archivepath' must be a path-like object to a zipfile, or to a specific path |
| 87 | inside a zipfile. For example, it can be '/tmp/myimport.zip', or |
| 88 | '/tmp/myimport.zip/mydirectory', if mydirectory is a valid directory inside |
| 89 | the archive. |
| 90 | |
| 91 | 'ZipImportError' is raised if 'archivepath' doesn't point to a valid Zip |
| 92 | archive. |
| 93 | |
| 94 | The 'archive' attribute of the zipimporter object contains the name of the |
| 95 | zipfile targeted. |
| 96 | |
| 97 | [clinic start generated code]*/ |
| 98 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 99 | static int |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 100 | zipimport_zipimporter___init___impl(ZipImporter *self, PyObject *path) |
| 101 | /*[clinic end generated code: output=141558fefdb46dc8 input=92b9ebeed1f6a704]*/ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 102 | { |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 103 | PyObject *files, *tmp; |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 104 | PyObject *filename = NULL; |
| 105 | Py_ssize_t len, flen; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 106 | |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 107 | if (PyUnicode_READY(path) == -1) |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 108 | return -1; |
| 109 | |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 110 | len = PyUnicode_GET_LENGTH(path); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 111 | if (len == 0) { |
| 112 | PyErr_SetString(ZipImportError, "archive path is empty"); |
Victor Stinner | 2b8dab7 | 2010-08-14 14:54:10 +0000 | [diff] [blame] | 113 | goto error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 114 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 115 | |
| 116 | #ifdef ALTSEP |
Martin v. Löwis | cfa6129 | 2011-10-31 09:01:22 +0100 | [diff] [blame] | 117 | tmp = _PyObject_CallMethodId(path, &PyId_replace, "CC", ALTSEP, SEP); |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 118 | if (!tmp) |
| 119 | goto error; |
| 120 | Py_DECREF(path); |
| 121 | path = tmp; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 122 | #endif |
| 123 | |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 124 | filename = path; |
| 125 | Py_INCREF(filename); |
| 126 | flen = len; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 127 | for (;;) { |
| 128 | struct stat statbuf; |
| 129 | int rv; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 130 | |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 131 | rv = _Py_stat(filename, &statbuf); |
Victor Stinner | bd0850b | 2011-12-18 20:47:30 +0100 | [diff] [blame] | 132 | if (rv == -2) |
| 133 | goto error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 134 | if (rv == 0) { |
| 135 | /* it exists */ |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 136 | if (!S_ISREG(statbuf.st_mode)) |
| 137 | /* it's a not file */ |
| 138 | Py_CLEAR(filename); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 139 | break; |
| 140 | } |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 141 | Py_CLEAR(filename); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 142 | /* back up one path element */ |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 143 | flen = PyUnicode_FindChar(path, SEP, 0, flen, -1); |
| 144 | if (flen == -1) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 145 | break; |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 146 | filename = PyUnicode_Substring(path, 0, flen); |
Victor Stinner | af8b7e8 | 2013-10-29 01:46:24 +0100 | [diff] [blame] | 147 | if (filename == NULL) |
| 148 | goto error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 149 | } |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 150 | if (filename == NULL) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 151 | PyErr_SetString(ZipImportError, "not a Zip file"); |
Victor Stinner | 2b8dab7 | 2010-08-14 14:54:10 +0000 | [diff] [blame] | 152 | goto error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 153 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 154 | |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 155 | if (PyUnicode_READY(filename) < 0) |
| 156 | goto error; |
| 157 | |
| 158 | files = PyDict_GetItem(zip_directory_cache, filename); |
Victor Stinner | 2b8dab7 | 2010-08-14 14:54:10 +0000 | [diff] [blame] | 159 | if (files == NULL) { |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 160 | files = read_directory(filename); |
| 161 | if (files == NULL) |
Victor Stinner | 2b8dab7 | 2010-08-14 14:54:10 +0000 | [diff] [blame] | 162 | goto error; |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 163 | if (PyDict_SetItem(zip_directory_cache, filename, files) != 0) |
Victor Stinner | 2b8dab7 | 2010-08-14 14:54:10 +0000 | [diff] [blame] | 164 | goto error; |
| 165 | } |
| 166 | else |
| 167 | Py_INCREF(files); |
Oren Milman | c0cabc2 | 2017-10-09 18:06:19 +0300 | [diff] [blame] | 168 | Py_XSETREF(self->files, files); |
Victor Stinner | 2b8dab7 | 2010-08-14 14:54:10 +0000 | [diff] [blame] | 169 | |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 170 | /* Transfer reference */ |
Oren Milman | c0cabc2 | 2017-10-09 18:06:19 +0300 | [diff] [blame] | 171 | Py_XSETREF(self->archive, filename); |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 172 | filename = NULL; |
Victor Stinner | 2b8dab7 | 2010-08-14 14:54:10 +0000 | [diff] [blame] | 173 | |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 174 | /* Check if there is a prefix directory following the filename. */ |
| 175 | if (flen != len) { |
| 176 | tmp = PyUnicode_Substring(path, flen+1, |
| 177 | PyUnicode_GET_LENGTH(path)); |
| 178 | if (tmp == NULL) |
| 179 | goto error; |
Oren Milman | c0cabc2 | 2017-10-09 18:06:19 +0300 | [diff] [blame] | 180 | Py_XSETREF(self->prefix, tmp); |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 181 | if (PyUnicode_READ_CHAR(path, len-1) != SEP) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 182 | /* add trailing SEP */ |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 183 | tmp = PyUnicode_FromFormat("%U%c", self->prefix, SEP); |
| 184 | if (tmp == NULL) |
| 185 | goto error; |
Serhiy Storchaka | 57a01d3 | 2016-04-10 18:05:40 +0300 | [diff] [blame] | 186 | Py_SETREF(self->prefix, tmp); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 187 | } |
| 188 | } |
Oren Milman | c0cabc2 | 2017-10-09 18:06:19 +0300 | [diff] [blame] | 189 | else { |
| 190 | Py_XSETREF(self->prefix, PyUnicode_New(0, 0)); |
| 191 | } |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 192 | Py_DECREF(path); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 193 | return 0; |
Victor Stinner | 2b8dab7 | 2010-08-14 14:54:10 +0000 | [diff] [blame] | 194 | |
| 195 | error: |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 196 | Py_DECREF(path); |
| 197 | Py_XDECREF(filename); |
Victor Stinner | 2b8dab7 | 2010-08-14 14:54:10 +0000 | [diff] [blame] | 198 | return -1; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 199 | } |
| 200 | |
| 201 | /* GC support. */ |
| 202 | static int |
| 203 | zipimporter_traverse(PyObject *obj, visitproc visit, void *arg) |
| 204 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 205 | ZipImporter *self = (ZipImporter *)obj; |
| 206 | Py_VISIT(self->files); |
| 207 | return 0; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 208 | } |
| 209 | |
| 210 | static void |
| 211 | zipimporter_dealloc(ZipImporter *self) |
| 212 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 213 | PyObject_GC_UnTrack(self); |
| 214 | Py_XDECREF(self->archive); |
| 215 | Py_XDECREF(self->prefix); |
| 216 | Py_XDECREF(self->files); |
| 217 | Py_TYPE(self)->tp_free((PyObject *)self); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 218 | } |
| 219 | |
| 220 | static PyObject * |
| 221 | zipimporter_repr(ZipImporter *self) |
| 222 | { |
Victor Stinner | 028dd97 | 2010-08-17 00:04:48 +0000 | [diff] [blame] | 223 | if (self->archive == NULL) |
| 224 | return PyUnicode_FromString("<zipimporter object \"???\">"); |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 225 | else if (self->prefix != NULL && PyUnicode_GET_LENGTH(self->prefix) != 0) |
Victor Stinner | 07298a1 | 2010-10-18 22:45:54 +0000 | [diff] [blame] | 226 | return PyUnicode_FromFormat("<zipimporter object \"%U%c%U\">", |
Victor Stinner | 028dd97 | 2010-08-17 00:04:48 +0000 | [diff] [blame] | 227 | self->archive, SEP, self->prefix); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 228 | else |
Victor Stinner | 07298a1 | 2010-10-18 22:45:54 +0000 | [diff] [blame] | 229 | return PyUnicode_FromFormat("<zipimporter object \"%U\">", |
Victor Stinner | 028dd97 | 2010-08-17 00:04:48 +0000 | [diff] [blame] | 230 | self->archive); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 231 | } |
| 232 | |
| 233 | /* return fullname.split(".")[-1] */ |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 234 | static PyObject * |
| 235 | get_subname(PyObject *fullname) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 236 | { |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 237 | Py_ssize_t len, dot; |
| 238 | if (PyUnicode_READY(fullname) < 0) |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 239 | return NULL; |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 240 | len = PyUnicode_GET_LENGTH(fullname); |
| 241 | dot = PyUnicode_FindChar(fullname, '.', 0, len, -1); |
| 242 | if (dot == -1) { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 243 | Py_INCREF(fullname); |
| 244 | return fullname; |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 245 | } else |
| 246 | return PyUnicode_Substring(fullname, dot+1, len); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 247 | } |
| 248 | |
| 249 | /* Given a (sub)modulename, write the potential file path in the |
| 250 | archive (without extension) to the path buffer. Return the |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 251 | length of the resulting string. |
| 252 | |
| 253 | return self.prefix + name.replace('.', os.sep) */ |
| 254 | static PyObject* |
| 255 | make_filename(PyObject *prefix, PyObject *name) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 256 | { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 257 | PyObject *pathobj; |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 258 | Py_UCS4 *p, *buf; |
| 259 | Py_ssize_t len; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 260 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 261 | len = PyUnicode_GET_LENGTH(prefix) + PyUnicode_GET_LENGTH(name) + 1; |
Serhiy Storchaka | 1a1ff29 | 2015-02-16 13:28:22 +0200 | [diff] [blame] | 262 | p = buf = PyMem_New(Py_UCS4, len); |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 263 | if (buf == NULL) { |
| 264 | PyErr_NoMemory(); |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 265 | return NULL; |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 266 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 267 | |
Christian Heimes | 1b5c76a | 2012-09-10 02:00:34 +0200 | [diff] [blame] | 268 | if (!PyUnicode_AsUCS4(prefix, p, len, 0)) { |
| 269 | PyMem_Free(buf); |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 270 | return NULL; |
Christian Heimes | 1b5c76a | 2012-09-10 02:00:34 +0200 | [diff] [blame] | 271 | } |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 272 | p += PyUnicode_GET_LENGTH(prefix); |
| 273 | len -= PyUnicode_GET_LENGTH(prefix); |
Christian Heimes | 1b5c76a | 2012-09-10 02:00:34 +0200 | [diff] [blame] | 274 | if (!PyUnicode_AsUCS4(name, p, len, 1)) { |
| 275 | PyMem_Free(buf); |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 276 | return NULL; |
Christian Heimes | 1b5c76a | 2012-09-10 02:00:34 +0200 | [diff] [blame] | 277 | } |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 278 | for (; *p; p++) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 279 | if (*p == '.') |
| 280 | *p = SEP; |
| 281 | } |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 282 | pathobj = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, |
| 283 | buf, p-buf); |
| 284 | PyMem_Free(buf); |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 285 | return pathobj; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 286 | } |
| 287 | |
Raymond Hettinger | 2c45c9a | 2004-11-10 13:08:35 +0000 | [diff] [blame] | 288 | enum zi_module_info { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 289 | MI_ERROR, |
| 290 | MI_NOT_FOUND, |
| 291 | MI_MODULE, |
| 292 | MI_PACKAGE |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 293 | }; |
| 294 | |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 295 | /* Does this path represent a directory? |
| 296 | on error, return < 0 |
| 297 | if not a dir, return 0 |
| 298 | if a dir, return 1 |
| 299 | */ |
| 300 | static int |
| 301 | check_is_directory(ZipImporter *self, PyObject* prefix, PyObject *path) |
| 302 | { |
| 303 | PyObject *dirpath; |
Benjamin Peterson | 18eac4a | 2012-05-25 00:24:42 -0700 | [diff] [blame] | 304 | int res; |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 305 | |
| 306 | /* See if this is a "directory". If so, it's eligible to be part |
| 307 | of a namespace package. We test by seeing if the name, with an |
| 308 | appended path separator, exists. */ |
| 309 | dirpath = PyUnicode_FromFormat("%U%U%c", prefix, path, SEP); |
| 310 | if (dirpath == NULL) |
| 311 | return -1; |
| 312 | /* If dirpath is present in self->files, we have a directory. */ |
Benjamin Peterson | 18eac4a | 2012-05-25 00:24:42 -0700 | [diff] [blame] | 313 | res = PyDict_Contains(self->files, dirpath); |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 314 | Py_DECREF(dirpath); |
Benjamin Peterson | 18eac4a | 2012-05-25 00:24:42 -0700 | [diff] [blame] | 315 | return res; |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 316 | } |
| 317 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 318 | /* Return some information about a module. */ |
Raymond Hettinger | 2c45c9a | 2004-11-10 13:08:35 +0000 | [diff] [blame] | 319 | static enum zi_module_info |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 320 | get_module_info(ZipImporter *self, PyObject *fullname) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 321 | { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 322 | PyObject *subname; |
| 323 | PyObject *path, *fullpath, *item; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 324 | struct st_zip_searchorder *zso; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 325 | |
Oren Milman | db60a5b | 2017-10-20 23:42:35 +0300 | [diff] [blame] | 326 | if (self->prefix == NULL) { |
| 327 | PyErr_SetString(PyExc_ValueError, |
| 328 | "zipimporter.__init__() wasn't called"); |
| 329 | return MI_ERROR; |
| 330 | } |
| 331 | |
Victor Stinner | 965a8a1 | 2010-10-18 21:44:33 +0000 | [diff] [blame] | 332 | subname = get_subname(fullname); |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 333 | if (subname == NULL) |
| 334 | return MI_ERROR; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 335 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 336 | path = make_filename(self->prefix, subname); |
| 337 | Py_DECREF(subname); |
| 338 | if (path == NULL) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 339 | return MI_ERROR; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 340 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 341 | for (zso = zip_searchorder; *zso->suffix; zso++) { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 342 | fullpath = PyUnicode_FromFormat("%U%s", path, zso->suffix); |
| 343 | if (fullpath == NULL) { |
| 344 | Py_DECREF(path); |
| 345 | return MI_ERROR; |
| 346 | } |
| 347 | item = PyDict_GetItem(self->files, fullpath); |
| 348 | Py_DECREF(fullpath); |
| 349 | if (item != NULL) { |
| 350 | Py_DECREF(path); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 351 | if (zso->type & IS_PACKAGE) |
| 352 | return MI_PACKAGE; |
| 353 | else |
| 354 | return MI_MODULE; |
| 355 | } |
| 356 | } |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 357 | Py_DECREF(path); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 358 | return MI_NOT_FOUND; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 359 | } |
| 360 | |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 361 | typedef enum { |
Brett Cannon | 56aae8f | 2016-01-15 11:22:19 -0800 | [diff] [blame] | 362 | FL_ERROR = -1, /* error */ |
| 363 | FL_NOT_FOUND, /* no loader or namespace portions found */ |
| 364 | FL_MODULE_FOUND, /* module/package found */ |
| 365 | FL_NS_FOUND /* namespace portion found: */ |
| 366 | /* *namespace_portion will point to the name */ |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 367 | } find_loader_result; |
| 368 | |
Brett Cannon | 56aae8f | 2016-01-15 11:22:19 -0800 | [diff] [blame] | 369 | /* The guts of "find_loader" and "find_module". |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 370 | */ |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 371 | static find_loader_result |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 372 | find_loader(ZipImporter *self, PyObject *fullname, PyObject **namespace_portion) |
| 373 | { |
| 374 | enum zi_module_info mi; |
| 375 | |
| 376 | *namespace_portion = NULL; |
| 377 | |
| 378 | mi = get_module_info(self, fullname); |
| 379 | if (mi == MI_ERROR) |
Benjamin Peterson | 46c214d | 2012-05-25 10:22:29 -0700 | [diff] [blame] | 380 | return FL_ERROR; |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 381 | if (mi == MI_NOT_FOUND) { |
| 382 | /* Not a module or regular package. See if this is a directory, and |
| 383 | therefore possibly a portion of a namespace package. */ |
Brett Cannon | 56aae8f | 2016-01-15 11:22:19 -0800 | [diff] [blame] | 384 | find_loader_result result = FL_NOT_FOUND; |
| 385 | PyObject *subname; |
| 386 | int is_dir; |
| 387 | |
| 388 | /* We're only interested in the last path component of fullname; |
| 389 | earlier components are recorded in self->prefix. */ |
| 390 | subname = get_subname(fullname); |
| 391 | if (subname == NULL) { |
| 392 | return FL_ERROR; |
| 393 | } |
| 394 | |
| 395 | is_dir = check_is_directory(self, self->prefix, subname); |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 396 | if (is_dir < 0) |
Brett Cannon | 56aae8f | 2016-01-15 11:22:19 -0800 | [diff] [blame] | 397 | result = FL_ERROR; |
| 398 | else if (is_dir) { |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 399 | /* This is possibly a portion of a namespace |
| 400 | package. Return the string representing its path, |
| 401 | without a trailing separator. */ |
| 402 | *namespace_portion = PyUnicode_FromFormat("%U%c%U%U", |
| 403 | self->archive, SEP, |
Brett Cannon | 56aae8f | 2016-01-15 11:22:19 -0800 | [diff] [blame] | 404 | self->prefix, subname); |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 405 | if (*namespace_portion == NULL) |
Brett Cannon | 56aae8f | 2016-01-15 11:22:19 -0800 | [diff] [blame] | 406 | result = FL_ERROR; |
| 407 | else |
| 408 | result = FL_NS_FOUND; |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 409 | } |
Brett Cannon | 56aae8f | 2016-01-15 11:22:19 -0800 | [diff] [blame] | 410 | Py_DECREF(subname); |
| 411 | return result; |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 412 | } |
| 413 | /* This is a module or package. */ |
Benjamin Peterson | 46c214d | 2012-05-25 10:22:29 -0700 | [diff] [blame] | 414 | return FL_MODULE_FOUND; |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 415 | } |
| 416 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 417 | /*[clinic input] |
| 418 | zipimport.zipimporter.find_module |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 419 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 420 | fullname: unicode |
| 421 | path: object = None |
| 422 | / |
| 423 | |
| 424 | Search for a module specified by 'fullname'. |
| 425 | |
| 426 | 'fullname' must be the fully qualified (dotted) module name. It returns the |
| 427 | zipimporter instance itself if the module was found, or None if it wasn't. |
| 428 | The optional 'path' argument is ignored -- it's there for compatibility |
| 429 | with the importer protocol. |
| 430 | |
| 431 | [clinic start generated code]*/ |
| 432 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 433 | static PyObject * |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 434 | zipimport_zipimporter_find_module_impl(ZipImporter *self, PyObject *fullname, |
| 435 | PyObject *path) |
| 436 | /*[clinic end generated code: output=506087f609466dc7 input=e3528520e075063f]*/ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 437 | { |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 438 | PyObject *namespace_portion = NULL; |
| 439 | PyObject *result = NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 440 | |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 441 | switch (find_loader(self, fullname, &namespace_portion)) { |
Benjamin Peterson | 46c214d | 2012-05-25 10:22:29 -0700 | [diff] [blame] | 442 | case FL_ERROR: |
Benjamin Peterson | a6a7a1a | 2012-05-25 00:22:04 -0700 | [diff] [blame] | 443 | return NULL; |
Benjamin Peterson | 46c214d | 2012-05-25 10:22:29 -0700 | [diff] [blame] | 444 | case FL_NS_FOUND: |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 445 | /* A namespace portion is not allowed via find_module, so return None. */ |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 446 | Py_DECREF(namespace_portion); |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 447 | /* FALL THROUGH */ |
Benjamin Peterson | 46c214d | 2012-05-25 10:22:29 -0700 | [diff] [blame] | 448 | case FL_NOT_FOUND: |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 449 | result = Py_None; |
| 450 | break; |
Benjamin Peterson | 46c214d | 2012-05-25 10:22:29 -0700 | [diff] [blame] | 451 | case FL_MODULE_FOUND: |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 452 | result = (PyObject *)self; |
| 453 | break; |
Brett Cannon | 56aae8f | 2016-01-15 11:22:19 -0800 | [diff] [blame] | 454 | default: |
| 455 | PyErr_BadInternalCall(); |
| 456 | return NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 457 | } |
Benjamin Peterson | a6a7a1a | 2012-05-25 00:22:04 -0700 | [diff] [blame] | 458 | Py_INCREF(result); |
Benjamin Peterson | 2d12e14 | 2012-05-25 00:19:40 -0700 | [diff] [blame] | 459 | return result; |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 460 | } |
| 461 | |
| 462 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 463 | /*[clinic input] |
| 464 | zipimport.zipimporter.find_loader |
| 465 | |
| 466 | fullname: unicode |
| 467 | path: object = None |
| 468 | / |
| 469 | |
| 470 | Search for a module specified by 'fullname'. |
| 471 | |
| 472 | 'fullname' must be the fully qualified (dotted) module name. It returns the |
| 473 | zipimporter instance itself if the module was found, a string containing the |
| 474 | full path name if it's possibly a portion of a namespace package, |
| 475 | or None otherwise. The optional 'path' argument is ignored -- it's |
| 476 | there for compatibility with the importer protocol. |
| 477 | |
| 478 | [clinic start generated code]*/ |
| 479 | |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 480 | static PyObject * |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 481 | zipimport_zipimporter_find_loader_impl(ZipImporter *self, PyObject *fullname, |
| 482 | PyObject *path) |
| 483 | /*[clinic end generated code: output=601599a43bc0f49a input=dc73f275b0d5be23]*/ |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 484 | { |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 485 | PyObject *result = NULL; |
| 486 | PyObject *namespace_portion = NULL; |
| 487 | |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 488 | switch (find_loader(self, fullname, &namespace_portion)) { |
Benjamin Peterson | 46c214d | 2012-05-25 10:22:29 -0700 | [diff] [blame] | 489 | case FL_ERROR: |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 490 | return NULL; |
Benjamin Peterson | 46c214d | 2012-05-25 10:22:29 -0700 | [diff] [blame] | 491 | case FL_NOT_FOUND: /* Not found, return (None, []) */ |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 492 | result = Py_BuildValue("O[]", Py_None); |
| 493 | break; |
Benjamin Peterson | 46c214d | 2012-05-25 10:22:29 -0700 | [diff] [blame] | 494 | case FL_MODULE_FOUND: /* Return (self, []) */ |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 495 | result = Py_BuildValue("O[]", self); |
| 496 | break; |
Benjamin Peterson | 46c214d | 2012-05-25 10:22:29 -0700 | [diff] [blame] | 497 | case FL_NS_FOUND: /* Return (None, [namespace_portion]) */ |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 498 | result = Py_BuildValue("O[O]", Py_None, namespace_portion); |
Benjamin Peterson | 209e04c | 2012-05-24 22:35:39 -0700 | [diff] [blame] | 499 | Py_DECREF(namespace_portion); |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 500 | return result; |
Brett Cannon | 56aae8f | 2016-01-15 11:22:19 -0800 | [diff] [blame] | 501 | default: |
| 502 | PyErr_BadInternalCall(); |
| 503 | return NULL; |
Eric V. Smith | 984b11f | 2012-05-24 20:21:04 -0400 | [diff] [blame] | 504 | } |
Benjamin Peterson | 5ed7bd7 | 2012-05-24 22:54:15 -0700 | [diff] [blame] | 505 | return result; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 506 | } |
| 507 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 508 | /*[clinic input] |
| 509 | zipimport.zipimporter.load_module |
| 510 | |
| 511 | fullname: unicode |
| 512 | / |
| 513 | |
| 514 | Load the module specified by 'fullname'. |
| 515 | |
| 516 | 'fullname' must be the fully qualified (dotted) module name. It returns the |
| 517 | imported module, or raises ZipImportError if it wasn't found. |
| 518 | |
| 519 | [clinic start generated code]*/ |
| 520 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 521 | static PyObject * |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 522 | zipimport_zipimporter_load_module_impl(ZipImporter *self, PyObject *fullname) |
| 523 | /*[clinic end generated code: output=7303cebf88d47953 input=c236e2e8621f04ef]*/ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 524 | { |
Victor Stinner | 26fabe1 | 2010-10-18 12:03:25 +0000 | [diff] [blame] | 525 | PyObject *code = NULL, *mod, *dict; |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 526 | PyObject *modpath = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 527 | int ispackage; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 528 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 529 | if (PyUnicode_READY(fullname) == -1) |
| 530 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 531 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 532 | code = get_module_code(self, fullname, &ispackage, &modpath); |
| 533 | if (code == NULL) |
Victor Stinner | 26fabe1 | 2010-10-18 12:03:25 +0000 | [diff] [blame] | 534 | goto error; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 535 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 536 | mod = PyImport_AddModuleObject(fullname); |
Victor Stinner | 26fabe1 | 2010-10-18 12:03:25 +0000 | [diff] [blame] | 537 | if (mod == NULL) |
| 538 | goto error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 539 | dict = PyModule_GetDict(mod); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 540 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 541 | /* mod.__loader__ = self */ |
| 542 | if (PyDict_SetItemString(dict, "__loader__", (PyObject *)self) != 0) |
| 543 | goto error; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 544 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 545 | if (ispackage) { |
| 546 | /* add __path__ to the module *before* the code gets |
| 547 | executed */ |
Victor Stinner | af8b7e8 | 2013-10-29 01:46:24 +0100 | [diff] [blame] | 548 | PyObject *pkgpath, *fullpath, *subname; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 549 | int err; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 550 | |
Victor Stinner | af8b7e8 | 2013-10-29 01:46:24 +0100 | [diff] [blame] | 551 | subname = get_subname(fullname); |
| 552 | if (subname == NULL) |
| 553 | goto error; |
| 554 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 555 | fullpath = PyUnicode_FromFormat("%U%c%U%U", |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 556 | self->archive, SEP, |
| 557 | self->prefix, subname); |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 558 | Py_DECREF(subname); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 559 | if (fullpath == NULL) |
| 560 | goto error; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 561 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 562 | pkgpath = Py_BuildValue("[N]", fullpath); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 563 | if (pkgpath == NULL) |
| 564 | goto error; |
| 565 | err = PyDict_SetItemString(dict, "__path__", pkgpath); |
| 566 | Py_DECREF(pkgpath); |
| 567 | if (err != 0) |
| 568 | goto error; |
| 569 | } |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 570 | mod = PyImport_ExecCodeModuleObject(fullname, code, modpath, NULL); |
Victor Stinner | 26fabe1 | 2010-10-18 12:03:25 +0000 | [diff] [blame] | 571 | Py_CLEAR(code); |
| 572 | if (mod == NULL) |
| 573 | goto error; |
| 574 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 575 | if (Py_VerboseFlag) |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 576 | PySys_FormatStderr("import %U # loaded from Zip %U\n", |
Victor Stinner | 08654e1 | 2010-10-18 12:09:02 +0000 | [diff] [blame] | 577 | fullname, modpath); |
| 578 | Py_DECREF(modpath); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 579 | return mod; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 580 | error: |
Victor Stinner | 26fabe1 | 2010-10-18 12:03:25 +0000 | [diff] [blame] | 581 | Py_XDECREF(code); |
Victor Stinner | 08654e1 | 2010-10-18 12:09:02 +0000 | [diff] [blame] | 582 | Py_XDECREF(modpath); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 583 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 584 | } |
| 585 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 586 | /*[clinic input] |
| 587 | zipimport.zipimporter.get_filename |
Nick Coghlan | f088e5e | 2008-12-14 11:50:48 +0000 | [diff] [blame] | 588 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 589 | fullname: unicode |
| 590 | / |
| 591 | |
| 592 | Return the filename for the specified module. |
| 593 | [clinic start generated code]*/ |
| 594 | |
| 595 | static PyObject * |
| 596 | zipimport_zipimporter_get_filename_impl(ZipImporter *self, |
| 597 | PyObject *fullname) |
| 598 | /*[clinic end generated code: output=c5b92b58bea86506 input=28d2eb57e4f25c8a]*/ |
| 599 | { |
| 600 | PyObject *code, *modpath; |
| 601 | int ispackage; |
Nick Coghlan | f088e5e | 2008-12-14 11:50:48 +0000 | [diff] [blame] | 602 | |
| 603 | /* Deciding the filename requires working out where the code |
| 604 | would come from if the module was actually loaded */ |
| 605 | code = get_module_code(self, fullname, &ispackage, &modpath); |
| 606 | if (code == NULL) |
Victor Stinner | c342fca | 2010-10-18 11:39:05 +0000 | [diff] [blame] | 607 | return NULL; |
Nick Coghlan | f088e5e | 2008-12-14 11:50:48 +0000 | [diff] [blame] | 608 | Py_DECREF(code); /* Only need the path info */ |
| 609 | |
Victor Stinner | 08654e1 | 2010-10-18 12:09:02 +0000 | [diff] [blame] | 610 | return modpath; |
Nick Coghlan | f088e5e | 2008-12-14 11:50:48 +0000 | [diff] [blame] | 611 | } |
| 612 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 613 | /*[clinic input] |
| 614 | zipimport.zipimporter.is_package |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 615 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 616 | fullname: unicode |
| 617 | / |
| 618 | |
| 619 | Return True if the module specified by fullname is a package. |
| 620 | |
| 621 | Raise ZipImportError if the module couldn't be found. |
| 622 | |
| 623 | [clinic start generated code]*/ |
| 624 | |
| 625 | static PyObject * |
| 626 | zipimport_zipimporter_is_package_impl(ZipImporter *self, PyObject *fullname) |
| 627 | /*[clinic end generated code: output=c32958c2a5216ae6 input=a7ba752f64345062]*/ |
| 628 | { |
| 629 | enum zi_module_info mi; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 630 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 631 | mi = get_module_info(self, fullname); |
| 632 | if (mi == MI_ERROR) |
Victor Stinner | 965a8a1 | 2010-10-18 21:44:33 +0000 | [diff] [blame] | 633 | return NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 634 | if (mi == MI_NOT_FOUND) { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 635 | PyErr_Format(ZipImportError, "can't find module %R", fullname); |
Victor Stinner | 965a8a1 | 2010-10-18 21:44:33 +0000 | [diff] [blame] | 636 | return NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 637 | } |
| 638 | return PyBool_FromLong(mi == MI_PACKAGE); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 639 | } |
| 640 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 641 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 642 | /*[clinic input] |
| 643 | zipimport.zipimporter.get_data |
| 644 | |
| 645 | pathname as path: unicode |
| 646 | / |
| 647 | |
| 648 | Return the data associated with 'pathname'. |
| 649 | |
| 650 | Raise OSError if the file was not found. |
| 651 | |
| 652 | [clinic start generated code]*/ |
| 653 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 654 | static PyObject * |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 655 | zipimport_zipimporter_get_data_impl(ZipImporter *self, PyObject *path) |
| 656 | /*[clinic end generated code: output=65dc506aaa268436 input=fa6428b74843c4ae]*/ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 657 | { |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 658 | PyObject *key; |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 659 | PyObject *toc_entry; |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 660 | Py_ssize_t path_start, path_len, len; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 661 | |
Oren Milman | db60a5b | 2017-10-20 23:42:35 +0300 | [diff] [blame] | 662 | if (self->archive == NULL) { |
| 663 | PyErr_SetString(PyExc_ValueError, |
| 664 | "zipimporter.__init__() wasn't called"); |
| 665 | return NULL; |
| 666 | } |
| 667 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 668 | #ifdef ALTSEP |
Oren Milman | 631fdee | 2017-08-29 20:40:15 +0300 | [diff] [blame] | 669 | path = _PyObject_CallMethodId((PyObject *)&PyUnicode_Type, &PyId_replace, |
| 670 | "OCC", path, ALTSEP, SEP); |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 671 | if (!path) |
| 672 | return NULL; |
| 673 | #else |
| 674 | Py_INCREF(path); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 675 | #endif |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 676 | if (PyUnicode_READY(path) == -1) |
| 677 | goto error; |
| 678 | |
| 679 | path_len = PyUnicode_GET_LENGTH(path); |
| 680 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 681 | len = PyUnicode_GET_LENGTH(self->archive); |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 682 | path_start = 0; |
| 683 | if (PyUnicode_Tailmatch(path, self->archive, 0, len, -1) |
| 684 | && PyUnicode_READ_CHAR(path, len) == SEP) { |
| 685 | path_start = len + 1; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 686 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 687 | |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 688 | key = PyUnicode_Substring(path, path_start, path_len); |
Victor Stinner | 60fe8d9 | 2010-08-16 23:48:11 +0000 | [diff] [blame] | 689 | if (key == NULL) |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 690 | goto error; |
Victor Stinner | 60fe8d9 | 2010-08-16 23:48:11 +0000 | [diff] [blame] | 691 | toc_entry = PyDict_GetItem(self->files, key); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 692 | if (toc_entry == NULL) { |
Serhiy Storchaka | 55fe1ae | 2017-04-16 10:46:38 +0300 | [diff] [blame] | 693 | PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, key); |
Victor Stinner | 60fe8d9 | 2010-08-16 23:48:11 +0000 | [diff] [blame] | 694 | Py_DECREF(key); |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 695 | goto error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 696 | } |
Victor Stinner | 60fe8d9 | 2010-08-16 23:48:11 +0000 | [diff] [blame] | 697 | Py_DECREF(key); |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 698 | Py_DECREF(path); |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 699 | return get_data(self->archive, toc_entry); |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 700 | error: |
| 701 | Py_DECREF(path); |
| 702 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 703 | } |
| 704 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 705 | /*[clinic input] |
| 706 | zipimport.zipimporter.get_code |
| 707 | |
| 708 | fullname: unicode |
| 709 | / |
| 710 | |
| 711 | Return the code object for the specified module. |
| 712 | |
| 713 | Raise ZipImportError if the module couldn't be found. |
| 714 | |
| 715 | [clinic start generated code]*/ |
| 716 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 717 | static PyObject * |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 718 | zipimport_zipimporter_get_code_impl(ZipImporter *self, PyObject *fullname) |
| 719 | /*[clinic end generated code: output=b923c37fa99cbac4 input=2761412bc37f3549]*/ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 720 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 721 | return get_module_code(self, fullname, NULL, NULL); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 722 | } |
| 723 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 724 | /*[clinic input] |
| 725 | zipimport.zipimporter.get_source |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 726 | |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 727 | fullname: unicode |
| 728 | / |
| 729 | |
| 730 | Return the source code for the specified module. |
| 731 | |
| 732 | Raise ZipImportError if the module couldn't be found, return None if the |
| 733 | archive does contain the module, but has no source for it. |
| 734 | |
| 735 | [clinic start generated code]*/ |
| 736 | |
| 737 | static PyObject * |
| 738 | zipimport_zipimporter_get_source_impl(ZipImporter *self, PyObject *fullname) |
| 739 | /*[clinic end generated code: output=bc059301b0c33729 input=4e4b186f2e690716]*/ |
| 740 | { |
| 741 | PyObject *toc_entry; |
| 742 | PyObject *subname, *path, *fullpath; |
| 743 | enum zi_module_info mi; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 744 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 745 | mi = get_module_info(self, fullname); |
Victor Stinner | 965a8a1 | 2010-10-18 21:44:33 +0000 | [diff] [blame] | 746 | if (mi == MI_ERROR) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 747 | return NULL; |
Victor Stinner | 0410656 | 2010-10-18 20:44:08 +0000 | [diff] [blame] | 748 | if (mi == MI_NOT_FOUND) { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 749 | PyErr_Format(ZipImportError, "can't find module %R", fullname); |
Victor Stinner | 0410656 | 2010-10-18 20:44:08 +0000 | [diff] [blame] | 750 | return NULL; |
| 751 | } |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 752 | |
Victor Stinner | 965a8a1 | 2010-10-18 21:44:33 +0000 | [diff] [blame] | 753 | subname = get_subname(fullname); |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 754 | if (subname == NULL) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 755 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 756 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 757 | path = make_filename(self->prefix, subname); |
| 758 | Py_DECREF(subname); |
| 759 | if (path == NULL) |
| 760 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 761 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 762 | if (mi == MI_PACKAGE) |
| 763 | fullpath = PyUnicode_FromFormat("%U%c__init__.py", path, SEP); |
| 764 | else |
| 765 | fullpath = PyUnicode_FromFormat("%U.py", path); |
| 766 | Py_DECREF(path); |
| 767 | if (fullpath == NULL) |
| 768 | return NULL; |
| 769 | |
| 770 | toc_entry = PyDict_GetItem(self->files, fullpath); |
| 771 | Py_DECREF(fullpath); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 772 | if (toc_entry != NULL) { |
Victor Stinner | 60fe8d9 | 2010-08-16 23:48:11 +0000 | [diff] [blame] | 773 | PyObject *res, *bytes; |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 774 | bytes = get_data(self->archive, toc_entry); |
Victor Stinner | 60fe8d9 | 2010-08-16 23:48:11 +0000 | [diff] [blame] | 775 | if (bytes == NULL) |
| 776 | return NULL; |
| 777 | res = PyUnicode_FromStringAndSize(PyBytes_AS_STRING(bytes), |
| 778 | PyBytes_GET_SIZE(bytes)); |
| 779 | Py_DECREF(bytes); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 780 | return res; |
| 781 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 782 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 783 | /* we have the module, but no source */ |
Serhiy Storchaka | 228b12e | 2017-01-23 09:47:21 +0200 | [diff] [blame] | 784 | Py_RETURN_NONE; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 785 | } |
| 786 | |
Barry Warsaw | 6f6eb35 | 2018-01-24 15:36:21 -0500 | [diff] [blame] | 787 | /*[clinic input] |
| 788 | zipimport.zipimporter.get_resource_reader |
| 789 | |
| 790 | fullname: unicode |
| 791 | / |
| 792 | |
| 793 | Return the ResourceReader for a package in a zip file. |
| 794 | |
| 795 | If 'fullname' is a package within the zip file, return the 'ResourceReader' |
| 796 | object for the package. Otherwise return None. |
| 797 | |
| 798 | [clinic start generated code]*/ |
| 799 | |
| 800 | static PyObject * |
| 801 | zipimport_zipimporter_get_resource_reader_impl(ZipImporter *self, |
| 802 | PyObject *fullname) |
| 803 | /*[clinic end generated code: output=5e367d431f830726 input=bfab94d736e99151]*/ |
| 804 | { |
| 805 | PyObject *module = PyImport_ImportModule("importlib.resources"); |
| 806 | if (module == NULL) { |
| 807 | return NULL; |
| 808 | } |
| 809 | PyObject *retval = PyObject_CallMethod( |
| 810 | module, "_zipimport_get_resource_reader", |
| 811 | "OO", (PyObject *)self, fullname); |
| 812 | Py_DECREF(module); |
| 813 | return retval; |
| 814 | } |
| 815 | |
Nick Coghlan | f088e5e | 2008-12-14 11:50:48 +0000 | [diff] [blame] | 816 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 817 | static PyMethodDef zipimporter_methods[] = { |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 818 | ZIPIMPORT_ZIPIMPORTER_FIND_MODULE_METHODDEF |
| 819 | ZIPIMPORT_ZIPIMPORTER_FIND_LOADER_METHODDEF |
| 820 | ZIPIMPORT_ZIPIMPORTER_LOAD_MODULE_METHODDEF |
| 821 | ZIPIMPORT_ZIPIMPORTER_GET_FILENAME_METHODDEF |
| 822 | ZIPIMPORT_ZIPIMPORTER_IS_PACKAGE_METHODDEF |
| 823 | ZIPIMPORT_ZIPIMPORTER_GET_DATA_METHODDEF |
| 824 | ZIPIMPORT_ZIPIMPORTER_GET_CODE_METHODDEF |
| 825 | ZIPIMPORT_ZIPIMPORTER_GET_SOURCE_METHODDEF |
Barry Warsaw | 6f6eb35 | 2018-01-24 15:36:21 -0500 | [diff] [blame] | 826 | ZIPIMPORT_ZIPIMPORTER_GET_RESOURCE_READER_METHODDEF |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 827 | {NULL, NULL} /* sentinel */ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 828 | }; |
| 829 | |
| 830 | static PyMemberDef zipimporter_members[] = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 831 | {"archive", T_OBJECT, offsetof(ZipImporter, archive), READONLY}, |
| 832 | {"prefix", T_OBJECT, offsetof(ZipImporter, prefix), READONLY}, |
| 833 | {"_files", T_OBJECT, offsetof(ZipImporter, files), READONLY}, |
| 834 | {NULL} |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 835 | }; |
| 836 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 837 | #define DEFERRED_ADDRESS(ADDR) 0 |
| 838 | |
| 839 | static PyTypeObject ZipImporter_Type = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 840 | PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) |
| 841 | "zipimport.zipimporter", |
| 842 | sizeof(ZipImporter), |
| 843 | 0, /* tp_itemsize */ |
| 844 | (destructor)zipimporter_dealloc, /* tp_dealloc */ |
| 845 | 0, /* tp_print */ |
| 846 | 0, /* tp_getattr */ |
| 847 | 0, /* tp_setattr */ |
| 848 | 0, /* tp_reserved */ |
| 849 | (reprfunc)zipimporter_repr, /* tp_repr */ |
| 850 | 0, /* tp_as_number */ |
| 851 | 0, /* tp_as_sequence */ |
| 852 | 0, /* tp_as_mapping */ |
| 853 | 0, /* tp_hash */ |
| 854 | 0, /* tp_call */ |
| 855 | 0, /* tp_str */ |
| 856 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 857 | 0, /* tp_setattro */ |
| 858 | 0, /* tp_as_buffer */ |
| 859 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | |
| 860 | Py_TPFLAGS_HAVE_GC, /* tp_flags */ |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 861 | zipimport_zipimporter___init____doc__, /* tp_doc */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 862 | zipimporter_traverse, /* tp_traverse */ |
| 863 | 0, /* tp_clear */ |
| 864 | 0, /* tp_richcompare */ |
| 865 | 0, /* tp_weaklistoffset */ |
| 866 | 0, /* tp_iter */ |
| 867 | 0, /* tp_iternext */ |
| 868 | zipimporter_methods, /* tp_methods */ |
| 869 | zipimporter_members, /* tp_members */ |
| 870 | 0, /* tp_getset */ |
| 871 | 0, /* tp_base */ |
| 872 | 0, /* tp_dict */ |
| 873 | 0, /* tp_descr_get */ |
| 874 | 0, /* tp_descr_set */ |
| 875 | 0, /* tp_dictoffset */ |
Yaron de Leeuw | 02f3b7d | 2017-08-18 14:41:13 -0400 | [diff] [blame] | 876 | (initproc)zipimport_zipimporter___init__, /* tp_init */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 877 | PyType_GenericAlloc, /* tp_alloc */ |
| 878 | PyType_GenericNew, /* tp_new */ |
| 879 | PyObject_GC_Del, /* tp_free */ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 880 | }; |
| 881 | |
| 882 | |
| 883 | /* implementation */ |
| 884 | |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 885 | /* Given a buffer, return the unsigned int that is represented by the first |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 886 | 4 bytes, encoded as little endian. This partially reimplements |
| 887 | marshal.c:r_long() */ |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 888 | static unsigned int |
| 889 | get_uint32(const unsigned char *buf) |
| 890 | { |
| 891 | unsigned int x; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 892 | x = buf[0]; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 893 | x |= (unsigned int)buf[1] << 8; |
| 894 | x |= (unsigned int)buf[2] << 16; |
| 895 | x |= (unsigned int)buf[3] << 24; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 896 | return x; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 897 | } |
| 898 | |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 899 | /* Given a buffer, return the unsigned int that is represented by the first |
| 900 | 2 bytes, encoded as little endian. This partially reimplements |
| 901 | marshal.c:r_short() */ |
| 902 | static unsigned short |
| 903 | get_uint16(const unsigned char *buf) |
| 904 | { |
| 905 | unsigned short x; |
| 906 | x = buf[0]; |
| 907 | x |= (unsigned short)buf[1] << 8; |
| 908 | return x; |
| 909 | } |
| 910 | |
| 911 | static void |
| 912 | set_file_error(PyObject *archive, int eof) |
| 913 | { |
| 914 | if (eof) { |
| 915 | PyErr_SetString(PyExc_EOFError, "EOF read where not expected"); |
| 916 | } |
| 917 | else { |
| 918 | PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, archive); |
| 919 | } |
| 920 | } |
| 921 | |
Gregory P. Smith | 2bcbc14 | 2014-01-07 18:30:07 -0800 | [diff] [blame] | 922 | /* |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 923 | read_directory(archive) -> files dict (new reference) |
Gregory P. Smith | 2bcbc14 | 2014-01-07 18:30:07 -0800 | [diff] [blame] | 924 | |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 925 | Given a path to a Zip archive, build a dict, mapping file names |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 926 | (local to the archive, using SEP as a separator) to toc entries. |
| 927 | |
| 928 | A toc_entry is a tuple: |
| 929 | |
Victor Stinner | 08654e1 | 2010-10-18 12:09:02 +0000 | [diff] [blame] | 930 | (__file__, # value to use for __file__, available for all files, |
| 931 | # encoded to the filesystem encoding |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 932 | compress, # compression kind; 0 for uncompressed |
| 933 | data_size, # size of compressed data on disk |
| 934 | file_size, # size of decompressed data |
| 935 | file_offset, # offset of file header from start of archive |
| 936 | time, # mod time of file (in dos format) |
| 937 | date, # mod data of file (in dos format) |
| 938 | crc, # crc checksum of the data |
Victor Stinner | c342fca | 2010-10-18 11:39:05 +0000 | [diff] [blame] | 939 | ) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 940 | |
| 941 | Directories can be recognized by the trailing SEP in the name, |
| 942 | data_size and file_offset are 0. |
| 943 | */ |
| 944 | static PyObject * |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 945 | read_directory(PyObject *archive) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 946 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 947 | PyObject *files = NULL; |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 948 | FILE *fp; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 949 | unsigned short flags, compress, time, date, name_size; |
| 950 | unsigned int crc, data_size, file_size, header_size, header_offset; |
| 951 | unsigned long file_offset, header_position; |
| 952 | unsigned long arc_offset; /* Absolute offset to start of the zip-archive. */ |
| 953 | unsigned int count, i; |
| 954 | unsigned char buffer[46]; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 955 | char name[MAXPATHLEN + 5]; |
Victor Stinner | 2460a43 | 2010-08-16 17:54:28 +0000 | [diff] [blame] | 956 | PyObject *nameobj = NULL; |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 957 | PyObject *path; |
Victor Stinner | d36c821 | 2010-10-18 12:13:46 +0000 | [diff] [blame] | 958 | const char *charset; |
Victor Stinner | 4ee65a9 | 2011-01-22 10:30:29 +0000 | [diff] [blame] | 959 | int bootstrap; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 960 | const char *errmsg = NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 961 | |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 962 | fp = _Py_fopen_obj(archive, "rb"); |
| 963 | if (fp == NULL) { |
Victor Stinner | fbd6f9e | 2015-03-20 10:52:25 +0100 | [diff] [blame] | 964 | if (PyErr_ExceptionMatches(PyExc_OSError)) { |
Serhiy Storchaka | 467ab19 | 2016-10-21 17:09:17 +0300 | [diff] [blame] | 965 | _PyErr_FormatFromCause(ZipImportError, |
| 966 | "can't open Zip file: %R", archive); |
Victor Stinner | fbd6f9e | 2015-03-20 10:52:25 +0100 | [diff] [blame] | 967 | } |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 968 | return NULL; |
| 969 | } |
| 970 | |
Jesus Cea | 09bf7a7 | 2012-10-03 02:13:05 +0200 | [diff] [blame] | 971 | if (fseek(fp, -22, SEEK_END) == -1) { |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 972 | goto file_error; |
Jesus Cea | 09bf7a7 | 2012-10-03 02:13:05 +0200 | [diff] [blame] | 973 | } |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 974 | header_position = (unsigned long)ftell(fp); |
| 975 | if (header_position == (unsigned long)-1) { |
| 976 | goto file_error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 977 | } |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 978 | assert(header_position <= (unsigned long)LONG_MAX); |
| 979 | if (fread(buffer, 1, 22, fp) != 22) { |
| 980 | goto file_error; |
| 981 | } |
| 982 | if (get_uint32(buffer) != 0x06054B50u) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 983 | /* Bad: End of Central Dir signature */ |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 984 | errmsg = "not a Zip file"; |
| 985 | goto invalid_header; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 986 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 987 | |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 988 | header_size = get_uint32(buffer + 12); |
| 989 | header_offset = get_uint32(buffer + 16); |
| 990 | if (header_position < header_size) { |
| 991 | errmsg = "bad central directory size"; |
| 992 | goto invalid_header; |
| 993 | } |
| 994 | if (header_position < header_offset) { |
| 995 | errmsg = "bad central directory offset"; |
| 996 | goto invalid_header; |
| 997 | } |
| 998 | if (header_position - header_size < header_offset) { |
| 999 | errmsg = "bad central directory size or offset"; |
| 1000 | goto invalid_header; |
| 1001 | } |
| 1002 | header_position -= header_size; |
| 1003 | arc_offset = header_position - header_offset; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1004 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1005 | files = PyDict_New(); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1006 | if (files == NULL) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1007 | goto error; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1008 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1009 | /* Start of Central Directory */ |
| 1010 | count = 0; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1011 | if (fseek(fp, (long)header_position, 0) == -1) { |
Serhiy Storchaka | 0e6b7b5 | 2013-02-16 17:43:45 +0200 | [diff] [blame] | 1012 | goto file_error; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1013 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1014 | for (;;) { |
| 1015 | PyObject *t; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1016 | size_t n; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1017 | int err; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1018 | |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1019 | n = fread(buffer, 1, 46, fp); |
| 1020 | if (n < 4) { |
| 1021 | goto eof_error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1022 | } |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1023 | /* Start of file header */ |
| 1024 | if (get_uint32(buffer) != 0x02014B50u) { |
| 1025 | break; /* Bad: Central Dir File Header */ |
| 1026 | } |
| 1027 | if (n != 46) { |
| 1028 | goto eof_error; |
| 1029 | } |
| 1030 | flags = get_uint16(buffer + 8); |
| 1031 | compress = get_uint16(buffer + 10); |
| 1032 | time = get_uint16(buffer + 12); |
| 1033 | date = get_uint16(buffer + 14); |
| 1034 | crc = get_uint32(buffer + 16); |
| 1035 | data_size = get_uint32(buffer + 20); |
| 1036 | file_size = get_uint32(buffer + 24); |
| 1037 | name_size = get_uint16(buffer + 28); |
| 1038 | header_size = (unsigned int)name_size + |
| 1039 | get_uint16(buffer + 30) /* extra field */ + |
| 1040 | get_uint16(buffer + 32) /* comment */; |
| 1041 | |
| 1042 | file_offset = get_uint32(buffer + 42); |
| 1043 | if (file_offset > header_offset) { |
| 1044 | errmsg = "bad local header offset"; |
| 1045 | goto invalid_header; |
| 1046 | } |
| 1047 | file_offset += arc_offset; |
| 1048 | |
| 1049 | if (name_size > MAXPATHLEN) { |
| 1050 | name_size = MAXPATHLEN; |
| 1051 | } |
| 1052 | if (fread(name, 1, name_size, fp) != name_size) { |
| 1053 | goto file_error; |
| 1054 | } |
| 1055 | name[name_size] = '\0'; /* Add terminating null byte */ |
Victor Stinner | 44d9bea | 2016-12-05 17:55:36 +0100 | [diff] [blame] | 1056 | #if SEP != '/' |
| 1057 | for (i = 0; i < name_size; i++) { |
| 1058 | if (name[i] == '/') { |
| 1059 | name[i] = SEP; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1060 | } |
| 1061 | } |
Victor Stinner | 44d9bea | 2016-12-05 17:55:36 +0100 | [diff] [blame] | 1062 | #endif |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1063 | /* Skip the rest of the header. |
| 1064 | * On Windows, calling fseek to skip over the fields we don't use is |
| 1065 | * slower than reading the data because fseek flushes stdio's |
| 1066 | * internal buffers. See issue #8745. */ |
| 1067 | assert(header_size <= 3*0xFFFFu); |
| 1068 | for (i = name_size; i < header_size; i++) { |
| 1069 | if (getc(fp) == EOF) { |
Serhiy Storchaka | 0e6b7b5 | 2013-02-16 17:43:45 +0200 | [diff] [blame] | 1070 | goto file_error; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1071 | } |
| 1072 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1073 | |
Victor Stinner | 4ee65a9 | 2011-01-22 10:30:29 +0000 | [diff] [blame] | 1074 | bootstrap = 0; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1075 | if (flags & 0x0800) { |
Victor Stinner | d36c821 | 2010-10-18 12:13:46 +0000 | [diff] [blame] | 1076 | charset = "utf-8"; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1077 | } |
Victor Stinner | 4ee65a9 | 2011-01-22 10:30:29 +0000 | [diff] [blame] | 1078 | else if (!PyThreadState_GET()->interp->codecs_initialized) { |
| 1079 | /* During bootstrap, we may need to load the encodings |
| 1080 | package from a ZIP file. But the cp437 encoding is implemented |
| 1081 | in Python in the encodings package. |
| 1082 | |
| 1083 | Break out of this dependency by assuming that the path to |
| 1084 | the encodings module is ASCII-only. */ |
| 1085 | charset = "ascii"; |
| 1086 | bootstrap = 1; |
| 1087 | } |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1088 | else { |
Victor Stinner | d36c821 | 2010-10-18 12:13:46 +0000 | [diff] [blame] | 1089 | charset = "cp437"; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1090 | } |
Victor Stinner | d36c821 | 2010-10-18 12:13:46 +0000 | [diff] [blame] | 1091 | nameobj = PyUnicode_Decode(name, name_size, charset, NULL); |
Victor Stinner | 4ee65a9 | 2011-01-22 10:30:29 +0000 | [diff] [blame] | 1092 | if (nameobj == NULL) { |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1093 | if (bootstrap) { |
Victor Stinner | 4ee65a9 | 2011-01-22 10:30:29 +0000 | [diff] [blame] | 1094 | PyErr_Format(PyExc_NotImplementedError, |
| 1095 | "bootstrap issue: python%i%i.zip contains non-ASCII " |
| 1096 | "filenames without the unicode flag", |
| 1097 | PY_MAJOR_VERSION, PY_MINOR_VERSION); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1098 | } |
Victor Stinner | 2460a43 | 2010-08-16 17:54:28 +0000 | [diff] [blame] | 1099 | goto error; |
Victor Stinner | 4ee65a9 | 2011-01-22 10:30:29 +0000 | [diff] [blame] | 1100 | } |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1101 | if (PyUnicode_READY(nameobj) == -1) { |
Stefan Krah | 000fde9 | 2012-08-20 14:14:49 +0200 | [diff] [blame] | 1102 | goto error; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1103 | } |
Martin v. Löwis | a72e78b | 2011-10-31 08:33:37 +0100 | [diff] [blame] | 1104 | path = PyUnicode_FromFormat("%U%c%U", archive, SEP, nameobj); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1105 | if (path == NULL) { |
Victor Stinner | 2460a43 | 2010-08-16 17:54:28 +0000 | [diff] [blame] | 1106 | goto error; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1107 | } |
| 1108 | t = Py_BuildValue("NHIIkHHI", path, compress, data_size, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1109 | file_size, file_offset, time, date, crc); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1110 | if (t == NULL) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1111 | goto error; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1112 | } |
Victor Stinner | 2460a43 | 2010-08-16 17:54:28 +0000 | [diff] [blame] | 1113 | err = PyDict_SetItem(files, nameobj, t); |
| 1114 | Py_CLEAR(nameobj); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1115 | Py_DECREF(t); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1116 | if (err != 0) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1117 | goto error; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1118 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1119 | count++; |
| 1120 | } |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 1121 | fclose(fp); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1122 | if (Py_VerboseFlag) { |
| 1123 | PySys_FormatStderr("# zipimport: found %u names in %R\n", |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1124 | count, archive); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1125 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1126 | return files; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1127 | |
| 1128 | eof_error: |
| 1129 | set_file_error(archive, !ferror(fp)); |
| 1130 | goto error; |
| 1131 | |
Serhiy Storchaka | 0e6b7b5 | 2013-02-16 17:43:45 +0200 | [diff] [blame] | 1132 | file_error: |
Jesus Cea | 09bf7a7 | 2012-10-03 02:13:05 +0200 | [diff] [blame] | 1133 | PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1134 | goto error; |
| 1135 | |
| 1136 | invalid_header: |
| 1137 | assert(errmsg != NULL); |
| 1138 | PyErr_Format(ZipImportError, "%s: %R", errmsg, archive); |
| 1139 | goto error; |
| 1140 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1141 | error: |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 1142 | fclose(fp); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1143 | Py_XDECREF(files); |
Victor Stinner | 2460a43 | 2010-08-16 17:54:28 +0000 | [diff] [blame] | 1144 | Py_XDECREF(nameobj); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1145 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1146 | } |
| 1147 | |
| 1148 | /* Return the zlib.decompress function object, or NULL if zlib couldn't |
| 1149 | be imported. The function is cached when found, so subsequent calls |
Victor Stinner | 4925cde | 2011-05-20 00:16:09 +0200 | [diff] [blame] | 1150 | don't import zlib again. */ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1151 | static PyObject * |
| 1152 | get_decompress_func(void) |
| 1153 | { |
Victor Stinner | 4925cde | 2011-05-20 00:16:09 +0200 | [diff] [blame] | 1154 | static int importing_zlib = 0; |
| 1155 | PyObject *zlib; |
| 1156 | PyObject *decompress; |
Martin v. Löwis | bd928fe | 2011-10-14 10:20:37 +0200 | [diff] [blame] | 1157 | _Py_IDENTIFIER(decompress); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1158 | |
Victor Stinner | 4925cde | 2011-05-20 00:16:09 +0200 | [diff] [blame] | 1159 | if (importing_zlib != 0) |
Xiang Zhang | 0710d75 | 2017-03-11 13:02:52 +0800 | [diff] [blame] | 1160 | /* Someone has a zlib.pyc in their Zip file; |
Victor Stinner | 4925cde | 2011-05-20 00:16:09 +0200 | [diff] [blame] | 1161 | let's avoid a stack overflow. */ |
| 1162 | return NULL; |
| 1163 | importing_zlib = 1; |
| 1164 | zlib = PyImport_ImportModuleNoBlock("zlib"); |
| 1165 | importing_zlib = 0; |
| 1166 | if (zlib != NULL) { |
Martin v. Löwis | 1ee1b6f | 2011-10-10 18:11:30 +0200 | [diff] [blame] | 1167 | decompress = _PyObject_GetAttrId(zlib, |
| 1168 | &PyId_decompress); |
Victor Stinner | 4925cde | 2011-05-20 00:16:09 +0200 | [diff] [blame] | 1169 | Py_DECREF(zlib); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1170 | } |
Victor Stinner | 4925cde | 2011-05-20 00:16:09 +0200 | [diff] [blame] | 1171 | else { |
| 1172 | PyErr_Clear(); |
| 1173 | decompress = NULL; |
| 1174 | } |
| 1175 | if (Py_VerboseFlag) |
| 1176 | PySys_WriteStderr("# zipimport: zlib %s\n", |
| 1177 | zlib != NULL ? "available": "UNAVAILABLE"); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1178 | return decompress; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1179 | } |
| 1180 | |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 1181 | /* Given a path to a Zip file and a toc_entry, return the (uncompressed) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1182 | data as a new reference. */ |
| 1183 | static PyObject * |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 1184 | get_data(PyObject *archive, PyObject *toc_entry) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1185 | { |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1186 | PyObject *raw_data = NULL, *data, *decompress; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1187 | char *buf; |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 1188 | FILE *fp; |
Victor Stinner | 60fe8d9 | 2010-08-16 23:48:11 +0000 | [diff] [blame] | 1189 | PyObject *datapath; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1190 | unsigned short compress, time, date; |
| 1191 | unsigned int crc; |
| 1192 | Py_ssize_t data_size, file_size, bytes_size; |
| 1193 | long file_offset, header_size; |
| 1194 | unsigned char buffer[30]; |
| 1195 | const char *errmsg = NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1196 | |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1197 | if (!PyArg_ParseTuple(toc_entry, "OHnnlHHI", &datapath, &compress, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1198 | &data_size, &file_size, &file_offset, &time, |
| 1199 | &date, &crc)) { |
| 1200 | return NULL; |
| 1201 | } |
Benjamin Peterson | b1db758 | 2016-01-21 22:02:46 -0800 | [diff] [blame] | 1202 | if (data_size < 0) { |
| 1203 | PyErr_Format(ZipImportError, "negative data size"); |
| 1204 | return NULL; |
| 1205 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1206 | |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 1207 | fp = _Py_fopen_obj(archive, "rb"); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1208 | if (!fp) { |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 1209 | return NULL; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1210 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1211 | /* Check to make sure the local file header is correct */ |
Jesus Cea | 09bf7a7 | 2012-10-03 02:13:05 +0200 | [diff] [blame] | 1212 | if (fseek(fp, file_offset, 0) == -1) { |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1213 | goto file_error; |
Jesus Cea | 09bf7a7 | 2012-10-03 02:13:05 +0200 | [diff] [blame] | 1214 | } |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1215 | if (fread(buffer, 1, 30, fp) != 30) { |
| 1216 | goto eof_error; |
| 1217 | } |
| 1218 | if (get_uint32(buffer) != 0x04034B50u) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1219 | /* Bad: Local File Header */ |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1220 | errmsg = "bad local file header"; |
| 1221 | goto invalid_header; |
Jesus Cea | 09bf7a7 | 2012-10-03 02:13:05 +0200 | [diff] [blame] | 1222 | } |
| 1223 | |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1224 | header_size = (unsigned int)30 + |
| 1225 | get_uint16(buffer + 26) /* file name */ + |
| 1226 | get_uint16(buffer + 28) /* extra field */; |
| 1227 | if (file_offset > LONG_MAX - header_size) { |
| 1228 | errmsg = "bad local file header size"; |
| 1229 | goto invalid_header; |
Victor Stinner | 73660af | 2013-10-29 01:43:44 +0100 | [diff] [blame] | 1230 | } |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1231 | file_offset += header_size; /* Start of file data */ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1232 | |
Benjamin Peterson | c4032da | 2016-01-20 22:23:44 -0800 | [diff] [blame] | 1233 | if (data_size > LONG_MAX - 1) { |
| 1234 | fclose(fp); |
| 1235 | PyErr_NoMemory(); |
| 1236 | return NULL; |
| 1237 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1238 | bytes_size = compress == 0 ? data_size : data_size + 1; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1239 | if (bytes_size == 0) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1240 | bytes_size++; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1241 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1242 | raw_data = PyBytes_FromStringAndSize((char *)NULL, bytes_size); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1243 | if (raw_data == NULL) { |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1244 | goto error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1245 | } |
| 1246 | buf = PyBytes_AsString(raw_data); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1247 | |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1248 | if (fseek(fp, file_offset, 0) == -1) { |
| 1249 | goto file_error; |
Jesus Cea | 09bf7a7 | 2012-10-03 02:13:05 +0200 | [diff] [blame] | 1250 | } |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1251 | if (fread(buf, 1, data_size, fp) != (size_t)data_size) { |
Serhiy Storchaka | 55fe1ae | 2017-04-16 10:46:38 +0300 | [diff] [blame] | 1252 | PyErr_SetString(PyExc_OSError, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1253 | "zipimport: can't read data"); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1254 | goto error; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1255 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1256 | |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1257 | fclose(fp); |
| 1258 | fp = NULL; |
| 1259 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1260 | if (compress != 0) { |
| 1261 | buf[data_size] = 'Z'; /* saw this in zipfile.py */ |
| 1262 | data_size++; |
| 1263 | } |
| 1264 | buf[data_size] = '\0'; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1265 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1266 | if (compress == 0) { /* data is not compressed */ |
| 1267 | data = PyBytes_FromStringAndSize(buf, data_size); |
| 1268 | Py_DECREF(raw_data); |
| 1269 | return data; |
| 1270 | } |
| 1271 | |
| 1272 | /* Decompress with zlib */ |
| 1273 | decompress = get_decompress_func(); |
| 1274 | if (decompress == NULL) { |
| 1275 | PyErr_SetString(ZipImportError, |
| 1276 | "can't decompress data; " |
| 1277 | "zlib not available"); |
| 1278 | goto error; |
| 1279 | } |
| 1280 | data = PyObject_CallFunction(decompress, "Oi", raw_data, -15); |
Victor Stinner | 4925cde | 2011-05-20 00:16:09 +0200 | [diff] [blame] | 1281 | Py_DECREF(decompress); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1282 | Py_DECREF(raw_data); |
Oren Milman | 01c6a88 | 2017-09-29 21:34:31 +0300 | [diff] [blame] | 1283 | if (data != NULL && !PyBytes_Check(data)) { |
| 1284 | PyErr_Format(PyExc_TypeError, |
| 1285 | "zlib.decompress() must return a bytes object, not " |
| 1286 | "%.200s", |
| 1287 | Py_TYPE(data)->tp_name); |
| 1288 | Py_DECREF(data); |
| 1289 | return NULL; |
| 1290 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1291 | return data; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1292 | |
| 1293 | eof_error: |
| 1294 | set_file_error(archive, !ferror(fp)); |
| 1295 | goto error; |
| 1296 | |
| 1297 | file_error: |
| 1298 | PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); |
| 1299 | goto error; |
| 1300 | |
| 1301 | invalid_header: |
| 1302 | assert(errmsg != NULL); |
| 1303 | PyErr_Format(ZipImportError, "%s: %R", errmsg, archive); |
| 1304 | goto error; |
| 1305 | |
| 1306 | error: |
| 1307 | if (fp != NULL) { |
| 1308 | fclose(fp); |
| 1309 | } |
| 1310 | Py_XDECREF(raw_data); |
| 1311 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1312 | } |
| 1313 | |
| 1314 | /* Lenient date/time comparison function. The precision of the mtime |
| 1315 | in the archive is lower than the mtime stored in a .pyc: we |
| 1316 | must allow a difference of at most one second. */ |
| 1317 | static int |
| 1318 | eq_mtime(time_t t1, time_t t2) |
| 1319 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1320 | time_t d = t1 - t2; |
| 1321 | if (d < 0) |
| 1322 | d = -d; |
| 1323 | /* dostime only stores even seconds, so be lenient */ |
| 1324 | return d <= 1; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1325 | } |
| 1326 | |
Xiang Zhang | 0710d75 | 2017-03-11 13:02:52 +0800 | [diff] [blame] | 1327 | /* Given the contents of a .pyc file in a buffer, unmarshal the data |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1328 | and return the code object. Return None if it the magic word doesn't |
| 1329 | match (we do this instead of raising an exception as we fall back |
| 1330 | to .py if available and we don't want to mask other errors). |
| 1331 | Returns a new reference. */ |
| 1332 | static PyObject * |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1333 | unmarshal_code(PyObject *pathname, PyObject *data, time_t mtime) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1334 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1335 | PyObject *code; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1336 | unsigned char *buf = (unsigned char *)PyBytes_AsString(data); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1337 | Py_ssize_t size = PyBytes_Size(data); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1338 | |
Benjamin Peterson | 42aa93b | 2017-12-09 10:26:52 -0800 | [diff] [blame] | 1339 | if (size < 16) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1340 | PyErr_SetString(ZipImportError, |
| 1341 | "bad pyc data"); |
| 1342 | return NULL; |
| 1343 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1344 | |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1345 | if (get_uint32(buf) != (unsigned int)PyImport_GetMagicNumber()) { |
| 1346 | if (Py_VerboseFlag) { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1347 | PySys_FormatStderr("# %R has bad magic\n", |
| 1348 | pathname); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1349 | } |
Serhiy Storchaka | 228b12e | 2017-01-23 09:47:21 +0200 | [diff] [blame] | 1350 | Py_RETURN_NONE; /* signal caller to try alternative */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1351 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1352 | |
Benjamin Peterson | 42aa93b | 2017-12-09 10:26:52 -0800 | [diff] [blame] | 1353 | uint32_t flags = get_uint32(buf + 4); |
| 1354 | if (flags != 0) { |
| 1355 | // Hash-based pyc. We currently refuse to handle checked hash-based |
| 1356 | // pycs. We could validate hash-based pycs against the source, but it |
| 1357 | // seems likely that most people putting hash-based pycs in a zipfile |
| 1358 | // will use unchecked ones. |
| 1359 | if (strcmp(_Py_CheckHashBasedPycsMode, "never") && |
| 1360 | (flags != 0x1 || !strcmp(_Py_CheckHashBasedPycsMode, "always"))) |
| 1361 | Py_RETURN_NONE; |
| 1362 | } else if ((mtime != 0 && !eq_mtime(get_uint32(buf + 8), mtime))) { |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1363 | if (Py_VerboseFlag) { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1364 | PySys_FormatStderr("# %R has bad mtime\n", |
| 1365 | pathname); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1366 | } |
Serhiy Storchaka | 228b12e | 2017-01-23 09:47:21 +0200 | [diff] [blame] | 1367 | Py_RETURN_NONE; /* signal caller to try alternative */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1368 | } |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1369 | |
Antoine Pitrou | 5136ac0 | 2012-01-13 18:52:16 +0100 | [diff] [blame] | 1370 | /* XXX the pyc's size field is ignored; timestamp collisions are probably |
| 1371 | unimportant with zip files. */ |
Benjamin Peterson | 42aa93b | 2017-12-09 10:26:52 -0800 | [diff] [blame] | 1372 | code = PyMarshal_ReadObjectFromString((char *)buf + 16, size - 16); |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1373 | if (code == NULL) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1374 | return NULL; |
Serhiy Storchaka | d5db573 | 2016-01-28 21:30:16 +0200 | [diff] [blame] | 1375 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1376 | if (!PyCode_Check(code)) { |
| 1377 | Py_DECREF(code); |
| 1378 | PyErr_Format(PyExc_TypeError, |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1379 | "compiled module %R is not a code object", |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1380 | pathname); |
| 1381 | return NULL; |
| 1382 | } |
| 1383 | return code; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1384 | } |
| 1385 | |
Martin Panter | 0be894b | 2016-09-07 12:03:06 +0000 | [diff] [blame] | 1386 | /* Replace any occurrences of "\r\n?" in the input string with "\n". |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1387 | This converts DOS and Mac line endings to Unix line endings. |
| 1388 | Also append a trailing "\n" to be compatible with |
| 1389 | PyParser_SimpleParseFile(). Returns a new reference. */ |
| 1390 | static PyObject * |
| 1391 | normalize_line_endings(PyObject *source) |
| 1392 | { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1393 | char *buf, *q, *p; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1394 | PyObject *fixed_source; |
| 1395 | int len = 0; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1396 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1397 | p = PyBytes_AsString(source); |
| 1398 | if (p == NULL) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1399 | return PyBytes_FromStringAndSize("\n\0", 2); |
| 1400 | } |
Thomas Wouters | 00ee7ba | 2006-08-21 19:07:27 +0000 | [diff] [blame] | 1401 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1402 | /* one char extra for trailing \n and one for terminating \0 */ |
| 1403 | buf = (char *)PyMem_Malloc(PyBytes_Size(source) + 2); |
| 1404 | if (buf == NULL) { |
| 1405 | PyErr_SetString(PyExc_MemoryError, |
| 1406 | "zipimport: no memory to allocate " |
| 1407 | "source buffer"); |
| 1408 | return NULL; |
| 1409 | } |
| 1410 | /* replace "\r\n?" by "\n" */ |
| 1411 | for (q = buf; *p != '\0'; p++) { |
| 1412 | if (*p == '\r') { |
| 1413 | *q++ = '\n'; |
| 1414 | if (*(p + 1) == '\n') |
| 1415 | p++; |
| 1416 | } |
| 1417 | else |
| 1418 | *q++ = *p; |
| 1419 | len++; |
| 1420 | } |
| 1421 | *q++ = '\n'; /* add trailing \n */ |
| 1422 | *q = '\0'; |
| 1423 | fixed_source = PyBytes_FromStringAndSize(buf, len + 2); |
| 1424 | PyMem_Free(buf); |
| 1425 | return fixed_source; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1426 | } |
| 1427 | |
| 1428 | /* Given a string buffer containing Python source code, compile it |
Brett Cannon | 83358c9 | 2013-06-20 21:30:32 -0400 | [diff] [blame] | 1429 | and return a code object as a new reference. */ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1430 | static PyObject * |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1431 | compile_source(PyObject *pathname, PyObject *source) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1432 | { |
Steve Dower | 8dcc48e | 2016-09-09 17:27:33 -0700 | [diff] [blame] | 1433 | PyObject *code, *fixed_source; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1434 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1435 | fixed_source = normalize_line_endings(source); |
| 1436 | if (fixed_source == NULL) { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1437 | return NULL; |
| 1438 | } |
| 1439 | |
Steve Dower | 8dcc48e | 2016-09-09 17:27:33 -0700 | [diff] [blame] | 1440 | code = Py_CompileStringObject(PyBytes_AsString(fixed_source), |
Berker Peksag | 4aa74c4 | 2016-09-14 08:09:48 +0300 | [diff] [blame] | 1441 | pathname, Py_file_input, NULL, -1); |
Steve Dower | 8dcc48e | 2016-09-09 17:27:33 -0700 | [diff] [blame] | 1442 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1443 | Py_DECREF(fixed_source); |
| 1444 | return code; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1445 | } |
| 1446 | |
| 1447 | /* Convert the date/time values found in the Zip archive to a value |
| 1448 | that's compatible with the time stamp stored in .pyc files. */ |
Neal Norwitz | 29fd2ba | 2003-03-23 13:21:03 +0000 | [diff] [blame] | 1449 | static time_t |
| 1450 | parse_dostime(int dostime, int dosdate) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1451 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1452 | struct tm stm; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1453 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1454 | memset((void *) &stm, '\0', sizeof(stm)); |
Christian Heimes | 679db4a | 2008-01-18 09:56:22 +0000 | [diff] [blame] | 1455 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1456 | stm.tm_sec = (dostime & 0x1f) * 2; |
| 1457 | stm.tm_min = (dostime >> 5) & 0x3f; |
| 1458 | stm.tm_hour = (dostime >> 11) & 0x1f; |
| 1459 | stm.tm_mday = dosdate & 0x1f; |
| 1460 | stm.tm_mon = ((dosdate >> 5) & 0x0f) - 1; |
| 1461 | stm.tm_year = ((dosdate >> 9) & 0x7f) + 80; |
| 1462 | stm.tm_isdst = -1; /* wday/yday is ignored */ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1463 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1464 | return mktime(&stm); |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1465 | } |
| 1466 | |
Brett Cannon | f299abd | 2015-04-13 14:21:02 -0400 | [diff] [blame] | 1467 | /* Given a path to a .pyc file in the archive, return the |
Ezio Melotti | 1392500 | 2011-03-16 11:05:33 +0200 | [diff] [blame] | 1468 | modification time of the matching .py file, or 0 if no source |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1469 | is available. */ |
| 1470 | static time_t |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1471 | get_mtime_of_source(ZipImporter *self, PyObject *path) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1472 | { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1473 | PyObject *toc_entry, *stripped; |
| 1474 | time_t mtime; |
| 1475 | |
Xiang Zhang | 0710d75 | 2017-03-11 13:02:52 +0800 | [diff] [blame] | 1476 | /* strip 'c' from *.pyc */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1477 | if (PyUnicode_READY(path) == -1) |
| 1478 | return (time_t)-1; |
| 1479 | stripped = PyUnicode_FromKindAndData(PyUnicode_KIND(path), |
| 1480 | PyUnicode_DATA(path), |
| 1481 | PyUnicode_GET_LENGTH(path) - 1); |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1482 | if (stripped == NULL) |
| 1483 | return (time_t)-1; |
| 1484 | |
| 1485 | toc_entry = PyDict_GetItem(self->files, stripped); |
| 1486 | Py_DECREF(stripped); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1487 | if (toc_entry != NULL && PyTuple_Check(toc_entry) && |
| 1488 | PyTuple_Size(toc_entry) == 8) { |
| 1489 | /* fetch the time stamp of the .py file for comparison |
| 1490 | with an embedded pyc time stamp */ |
| 1491 | int time, date; |
| 1492 | time = PyLong_AsLong(PyTuple_GetItem(toc_entry, 5)); |
| 1493 | date = PyLong_AsLong(PyTuple_GetItem(toc_entry, 6)); |
| 1494 | mtime = parse_dostime(time, date); |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1495 | } else |
| 1496 | mtime = 0; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1497 | return mtime; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1498 | } |
| 1499 | |
| 1500 | /* Return the code object for the module named by 'fullname' from the |
| 1501 | Zip archive as a new reference. */ |
| 1502 | static PyObject * |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 1503 | get_code_from_data(ZipImporter *self, int ispackage, int isbytecode, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1504 | time_t mtime, PyObject *toc_entry) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1505 | { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1506 | PyObject *data, *modpath, *code; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1507 | |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 1508 | data = get_data(self->archive, toc_entry); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1509 | if (data == NULL) |
| 1510 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1511 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1512 | modpath = PyTuple_GetItem(toc_entry, 0); |
Victor Stinner | 2a94f4c | 2010-10-18 12:15:34 +0000 | [diff] [blame] | 1513 | if (isbytecode) |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1514 | code = unmarshal_code(modpath, data, mtime); |
Victor Stinner | 2a94f4c | 2010-10-18 12:15:34 +0000 | [diff] [blame] | 1515 | else |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1516 | code = compile_source(modpath, data); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1517 | Py_DECREF(data); |
| 1518 | return code; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1519 | } |
| 1520 | |
Ezio Melotti | 42da663 | 2011-03-15 05:18:48 +0200 | [diff] [blame] | 1521 | /* Get the code object associated with the module specified by |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1522 | 'fullname'. */ |
| 1523 | static PyObject * |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1524 | get_module_code(ZipImporter *self, PyObject *fullname, |
Victor Stinner | 08654e1 | 2010-10-18 12:09:02 +0000 | [diff] [blame] | 1525 | int *p_ispackage, PyObject **p_modpath) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1526 | { |
Gregory P. Smith | 95c7c46 | 2011-05-21 05:19:42 -0700 | [diff] [blame] | 1527 | PyObject *code = NULL, *toc_entry, *subname; |
Victor Stinner | 9a2261a | 2011-05-26 13:59:41 +0200 | [diff] [blame] | 1528 | PyObject *path, *fullpath = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1529 | struct st_zip_searchorder *zso; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1530 | |
Oren Milman | db60a5b | 2017-10-20 23:42:35 +0300 | [diff] [blame] | 1531 | if (self->prefix == NULL) { |
| 1532 | PyErr_SetString(PyExc_ValueError, |
| 1533 | "zipimporter.__init__() wasn't called"); |
| 1534 | return NULL; |
| 1535 | } |
| 1536 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1537 | subname = get_subname(fullname); |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1538 | if (subname == NULL) |
| 1539 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1540 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1541 | path = make_filename(self->prefix, subname); |
| 1542 | Py_DECREF(subname); |
| 1543 | if (path == NULL) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1544 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1545 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1546 | for (zso = zip_searchorder; *zso->suffix; zso++) { |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1547 | code = NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1548 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1549 | fullpath = PyUnicode_FromFormat("%U%s", path, zso->suffix); |
| 1550 | if (fullpath == NULL) |
| 1551 | goto exit; |
| 1552 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1553 | if (Py_VerboseFlag > 1) |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1554 | PySys_FormatStderr("# trying %U%c%U\n", |
| 1555 | self->archive, (int)SEP, fullpath); |
| 1556 | toc_entry = PyDict_GetItem(self->files, fullpath); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1557 | if (toc_entry != NULL) { |
| 1558 | time_t mtime = 0; |
| 1559 | int ispackage = zso->type & IS_PACKAGE; |
| 1560 | int isbytecode = zso->type & IS_BYTECODE; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1561 | |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1562 | if (isbytecode) { |
| 1563 | mtime = get_mtime_of_source(self, fullpath); |
| 1564 | if (mtime == (time_t)-1 && PyErr_Occurred()) { |
| 1565 | goto exit; |
| 1566 | } |
| 1567 | } |
| 1568 | Py_CLEAR(fullpath); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1569 | if (p_ispackage != NULL) |
| 1570 | *p_ispackage = ispackage; |
Benjamin Peterson | 34c1540 | 2014-02-16 14:17:28 -0500 | [diff] [blame] | 1571 | code = get_code_from_data(self, ispackage, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1572 | isbytecode, mtime, |
| 1573 | toc_entry); |
| 1574 | if (code == Py_None) { |
| 1575 | /* bad magic number or non-matching mtime |
| 1576 | in byte code, try next */ |
| 1577 | Py_DECREF(code); |
| 1578 | continue; |
| 1579 | } |
Victor Stinner | 08654e1 | 2010-10-18 12:09:02 +0000 | [diff] [blame] | 1580 | if (code != NULL && p_modpath != NULL) { |
| 1581 | *p_modpath = PyTuple_GetItem(toc_entry, 0); |
| 1582 | Py_INCREF(*p_modpath); |
| 1583 | } |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1584 | goto exit; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1585 | } |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1586 | else |
| 1587 | Py_CLEAR(fullpath); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1588 | } |
Victor Stinner | f6b563a | 2011-03-14 20:46:50 -0400 | [diff] [blame] | 1589 | PyErr_Format(ZipImportError, "can't find module %R", fullname); |
| 1590 | exit: |
| 1591 | Py_DECREF(path); |
| 1592 | Py_XDECREF(fullpath); |
| 1593 | return code; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1594 | } |
| 1595 | |
| 1596 | |
| 1597 | /* Module init */ |
| 1598 | |
| 1599 | PyDoc_STRVAR(zipimport_doc, |
| 1600 | "zipimport provides support for importing Python modules from Zip archives.\n\ |
| 1601 | \n\ |
| 1602 | This module exports three objects:\n\ |
| 1603 | - zipimporter: a class; its constructor takes a path to a Zip archive.\n\ |
Fredrik Lundh | b84b35f | 2006-01-15 15:00:40 +0000 | [diff] [blame] | 1604 | - ZipImportError: exception raised by zipimporter objects. It's a\n\ |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1605 | subclass of ImportError, so it can be caught as ImportError, too.\n\ |
| 1606 | - _zip_directory_cache: a dict, mapping archive paths to zip directory\n\ |
| 1607 | info dicts, as used in zipimporter._files.\n\ |
| 1608 | \n\ |
| 1609 | It is usually not needed to use the zipimport module explicitly; it is\n\ |
| 1610 | used by the builtin import mechanism for sys.path items that are paths\n\ |
| 1611 | to Zip archives."); |
| 1612 | |
Martin v. Löwis | 1a21451 | 2008-06-11 05:26:20 +0000 | [diff] [blame] | 1613 | static struct PyModuleDef zipimportmodule = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1614 | PyModuleDef_HEAD_INIT, |
| 1615 | "zipimport", |
| 1616 | zipimport_doc, |
| 1617 | -1, |
| 1618 | NULL, |
| 1619 | NULL, |
| 1620 | NULL, |
| 1621 | NULL, |
| 1622 | NULL |
Martin v. Löwis | 1a21451 | 2008-06-11 05:26:20 +0000 | [diff] [blame] | 1623 | }; |
| 1624 | |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1625 | PyMODINIT_FUNC |
Martin v. Löwis | 1a21451 | 2008-06-11 05:26:20 +0000 | [diff] [blame] | 1626 | PyInit_zipimport(void) |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1627 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1628 | PyObject *mod; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1629 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1630 | if (PyType_Ready(&ZipImporter_Type) < 0) |
| 1631 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1632 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1633 | /* Correct directory separator */ |
| 1634 | zip_searchorder[0].suffix[0] = SEP; |
| 1635 | zip_searchorder[1].suffix[0] = SEP; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1636 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1637 | mod = PyModule_Create(&zipimportmodule); |
| 1638 | if (mod == NULL) |
| 1639 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1640 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1641 | ZipImportError = PyErr_NewException("zipimport.ZipImportError", |
| 1642 | PyExc_ImportError, NULL); |
| 1643 | if (ZipImportError == NULL) |
| 1644 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1645 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1646 | Py_INCREF(ZipImportError); |
| 1647 | if (PyModule_AddObject(mod, "ZipImportError", |
| 1648 | ZipImportError) < 0) |
| 1649 | return NULL; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1650 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1651 | Py_INCREF(&ZipImporter_Type); |
| 1652 | if (PyModule_AddObject(mod, "zipimporter", |
| 1653 | (PyObject *)&ZipImporter_Type) < 0) |
| 1654 | return NULL; |
Just van Rossum | f8b6de1 | 2002-12-31 09:51:59 +0000 | [diff] [blame] | 1655 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1656 | zip_directory_cache = PyDict_New(); |
| 1657 | if (zip_directory_cache == NULL) |
| 1658 | return NULL; |
| 1659 | Py_INCREF(zip_directory_cache); |
| 1660 | if (PyModule_AddObject(mod, "_zip_directory_cache", |
| 1661 | zip_directory_cache) < 0) |
| 1662 | return NULL; |
| 1663 | return mod; |
Just van Rossum | 52e14d6 | 2002-12-30 22:08:05 +0000 | [diff] [blame] | 1664 | } |