2002-12-30 22:08:05 +00:00
|
|
|
#include "Python.h"
|
2017-12-09 10:26:52 -08:00
|
|
|
#include "internal/import.h"
|
2017-09-07 23:51:28 -06:00
|
|
|
#include "internal/pystate.h"
|
2002-12-30 22:08:05 +00:00
|
|
|
#include "structmember.h"
|
|
|
|
|
#include "osdefs.h"
|
|
|
|
|
#include "marshal.h"
|
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define IS_SOURCE 0x0
|
|
|
|
|
#define IS_BYTECODE 0x1
|
|
|
|
|
#define IS_PACKAGE 0x2
|
|
|
|
|
|
|
|
|
|
struct st_zip_searchorder {
|
2010-05-09 15:52:27 +00:00
|
|
|
char suffix[14];
|
|
|
|
|
int type;
|
2002-12-30 22:08:05 +00:00
|
|
|
};
|
|
|
|
|
|
2013-11-12 21:44:18 +01:00
|
|
|
#ifdef ALTSEP
|
|
|
|
|
_Py_IDENTIFIER(replace);
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
/* zip_searchorder defines how we search for a module in the Zip
|
|
|
|
|
archive: we first search for a package __init__, then for
|
2015-04-13 14:21:02 -04:00
|
|
|
non-package .pyc, and .py entries. The .pyc entries
|
2002-12-30 22:08:05 +00:00
|
|
|
are swapped by initzipimport() if we run in optimized mode. Also,
|
|
|
|
|
'/' is replaced by SEP there. */
|
2003-03-23 13:21:03 +00:00
|
|
|
static struct st_zip_searchorder zip_searchorder[] = {
|
2010-05-09 15:52:27 +00:00
|
|
|
{"/__init__.pyc", IS_PACKAGE | IS_BYTECODE},
|
|
|
|
|
{"/__init__.py", IS_PACKAGE | IS_SOURCE},
|
|
|
|
|
{".pyc", IS_BYTECODE},
|
|
|
|
|
{".py", IS_SOURCE},
|
|
|
|
|
{"", 0}
|
2002-12-30 22:08:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* zipimporter object definition and support */
|
|
|
|
|
|
|
|
|
|
typedef struct _zipimporter ZipImporter;
|
|
|
|
|
|
|
|
|
|
struct _zipimporter {
|
2010-05-09 15:52:27 +00:00
|
|
|
PyObject_HEAD
|
2010-10-18 22:34:46 +00:00
|
|
|
PyObject *archive; /* pathname of the Zip archive,
|
|
|
|
|
decoded from the filesystem encoding */
|
2010-10-18 11:44:21 +00:00
|
|
|
PyObject *prefix; /* file prefix: "a/sub/directory/",
|
|
|
|
|
encoded to the filesystem encoding */
|
2010-05-09 15:52:27 +00:00
|
|
|
PyObject *files; /* dict with file info {path: toc_entry} */
|
2002-12-30 22:08:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static PyObject *ZipImportError;
|
2010-10-18 11:39:05 +00:00
|
|
|
/* read_directory() cache */
|
2002-12-30 22:08:05 +00:00
|
|
|
static PyObject *zip_directory_cache = NULL;
|
|
|
|
|
|
|
|
|
|
/* forward decls */
|
2014-02-16 14:17:28 -05:00
|
|
|
static PyObject *read_directory(PyObject *archive);
|
|
|
|
|
static PyObject *get_data(PyObject *archive, PyObject *toc_entry);
|
2011-03-14 20:46:50 -04:00
|
|
|
static PyObject *get_module_code(ZipImporter *self, PyObject *fullname,
|
2010-10-18 12:09:02 +00:00
|
|
|
int *p_ispackage, PyObject **p_modpath);
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
static PyTypeObject ZipImporter_Type;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
|
|
|
|
#define ZipImporter_Check(op) PyObject_TypeCheck(op, &ZipImporter_Type)
|
|
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
/*[clinic input]
|
|
|
|
|
module zipimport
|
|
|
|
|
class zipimport.zipimporter "ZipImporter *" "&ZipImporter_Type"
|
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=9db8b61557d911e7]*/
|
|
|
|
|
#include "clinic/zipimport.c.h"
|
|
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
|
|
|
|
|
/* zipimporter.__init__
|
|
|
|
|
Split the "subdirectory" from the Zip archive path, lookup a matching
|
|
|
|
|
entry in sys.path_importer_cache, fetch the file directory from there
|
|
|
|
|
if found, or else read it from the archive. */
|
2017-08-18 14:41:13 -04:00
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
|
zipimport.zipimporter.__init__
|
|
|
|
|
|
|
|
|
|
archivepath as path: object(converter="PyUnicode_FSDecoder")
|
|
|
|
|
A path-like object to a zipfile, or to a specific path inside
|
|
|
|
|
a zipfile.
|
|
|
|
|
/
|
|
|
|
|
|
|
|
|
|
Create a new zipimporter instance.
|
|
|
|
|
|
|
|
|
|
'archivepath' must be a path-like object to a zipfile, or to a specific path
|
|
|
|
|
inside a zipfile. For example, it can be '/tmp/myimport.zip', or
|
|
|
|
|
'/tmp/myimport.zip/mydirectory', if mydirectory is a valid directory inside
|
|
|
|
|
the archive.
|
|
|
|
|
|
|
|
|
|
'ZipImportError' is raised if 'archivepath' doesn't point to a valid Zip
|
|
|
|
|
archive.
|
|
|
|
|
|
|
|
|
|
The 'archive' attribute of the zipimporter object contains the name of the
|
|
|
|
|
zipfile targeted.
|
|
|
|
|
|
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
static int
|
2017-08-18 14:41:13 -04:00
|
|
|
zipimport_zipimporter___init___impl(ZipImporter *self, PyObject *path)
|
|
|
|
|
/*[clinic end generated code: output=141558fefdb46dc8 input=92b9ebeed1f6a704]*/
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2017-08-18 14:41:13 -04:00
|
|
|
PyObject *files, *tmp;
|
2011-10-31 08:33:37 +01:00
|
|
|
PyObject *filename = NULL;
|
|
|
|
|
Py_ssize_t len, flen;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-10-31 08:33:37 +01:00
|
|
|
if (PyUnicode_READY(path) == -1)
|
2011-09-28 07:41:54 +02:00
|
|
|
return -1;
|
|
|
|
|
|
2011-10-31 08:33:37 +01:00
|
|
|
len = PyUnicode_GET_LENGTH(path);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (len == 0) {
|
|
|
|
|
PyErr_SetString(ZipImportError, "archive path is empty");
|
2010-08-14 14:54:10 +00:00
|
|
|
goto error;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
|
|
|
|
#ifdef ALTSEP
|
2011-10-31 09:01:22 +01:00
|
|
|
tmp = _PyObject_CallMethodId(path, &PyId_replace, "CC", ALTSEP, SEP);
|
2011-10-31 08:33:37 +01:00
|
|
|
if (!tmp)
|
|
|
|
|
goto error;
|
|
|
|
|
Py_DECREF(path);
|
|
|
|
|
path = tmp;
|
2002-12-30 22:08:05 +00:00
|
|
|
#endif
|
|
|
|
|
|
2011-10-31 08:33:37 +01:00
|
|
|
filename = path;
|
|
|
|
|
Py_INCREF(filename);
|
|
|
|
|
flen = len;
|
2010-05-09 15:52:27 +00:00
|
|
|
for (;;) {
|
|
|
|
|
struct stat statbuf;
|
|
|
|
|
int rv;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-10-31 08:33:37 +01:00
|
|
|
rv = _Py_stat(filename, &statbuf);
|
2011-12-18 20:47:30 +01:00
|
|
|
if (rv == -2)
|
|
|
|
|
goto error;
|
2010-05-09 15:52:27 +00:00
|
|
|
if (rv == 0) {
|
|
|
|
|
/* it exists */
|
2011-10-31 08:33:37 +01:00
|
|
|
if (!S_ISREG(statbuf.st_mode))
|
|
|
|
|
/* it's a not file */
|
|
|
|
|
Py_CLEAR(filename);
|
2010-05-09 15:52:27 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2011-10-31 08:33:37 +01:00
|
|
|
Py_CLEAR(filename);
|
2010-05-09 15:52:27 +00:00
|
|
|
/* back up one path element */
|
2011-10-31 08:33:37 +01:00
|
|
|
flen = PyUnicode_FindChar(path, SEP, 0, flen, -1);
|
|
|
|
|
if (flen == -1)
|
2010-05-09 15:52:27 +00:00
|
|
|
break;
|
2011-10-31 08:33:37 +01:00
|
|
|
filename = PyUnicode_Substring(path, 0, flen);
|
2013-10-29 01:46:24 +01:00
|
|
|
if (filename == NULL)
|
|
|
|
|
goto error;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2011-10-31 08:33:37 +01:00
|
|
|
if (filename == NULL) {
|
2010-05-09 15:52:27 +00:00
|
|
|
PyErr_SetString(ZipImportError, "not a Zip file");
|
2010-08-14 14:54:10 +00:00
|
|
|
goto error;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-10-31 08:33:37 +01:00
|
|
|
if (PyUnicode_READY(filename) < 0)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
files = PyDict_GetItem(zip_directory_cache, filename);
|
2010-08-14 14:54:10 +00:00
|
|
|
if (files == NULL) {
|
2014-02-16 14:17:28 -05:00
|
|
|
files = read_directory(filename);
|
|
|
|
|
if (files == NULL)
|
2010-08-14 14:54:10 +00:00
|
|
|
goto error;
|
2014-02-16 14:17:28 -05:00
|
|
|
if (PyDict_SetItem(zip_directory_cache, filename, files) != 0)
|
2010-08-14 14:54:10 +00:00
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
Py_INCREF(files);
|
2017-10-09 18:06:19 +03:00
|
|
|
Py_XSETREF(self->files, files);
|
2010-08-14 14:54:10 +00:00
|
|
|
|
2011-10-31 08:33:37 +01:00
|
|
|
/* Transfer reference */
|
2017-10-09 18:06:19 +03:00
|
|
|
Py_XSETREF(self->archive, filename);
|
2011-10-31 08:33:37 +01:00
|
|
|
filename = NULL;
|
2010-08-14 14:54:10 +00:00
|
|
|
|
2011-10-31 08:33:37 +01:00
|
|
|
/* Check if there is a prefix directory following the filename. */
|
|
|
|
|
if (flen != len) {
|
|
|
|
|
tmp = PyUnicode_Substring(path, flen+1,
|
|
|
|
|
PyUnicode_GET_LENGTH(path));
|
|
|
|
|
if (tmp == NULL)
|
|
|
|
|
goto error;
|
2017-10-09 18:06:19 +03:00
|
|
|
Py_XSETREF(self->prefix, tmp);
|
2011-10-31 08:33:37 +01:00
|
|
|
if (PyUnicode_READ_CHAR(path, len-1) != SEP) {
|
2010-05-09 15:52:27 +00:00
|
|
|
/* add trailing SEP */
|
2011-10-31 08:33:37 +01:00
|
|
|
tmp = PyUnicode_FromFormat("%U%c", self->prefix, SEP);
|
|
|
|
|
if (tmp == NULL)
|
|
|
|
|
goto error;
|
2016-04-10 18:05:40 +03:00
|
|
|
Py_SETREF(self->prefix, tmp);
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
|
|
|
|
}
|
2017-10-09 18:06:19 +03:00
|
|
|
else {
|
|
|
|
|
Py_XSETREF(self->prefix, PyUnicode_New(0, 0));
|
|
|
|
|
}
|
2011-10-31 08:33:37 +01:00
|
|
|
Py_DECREF(path);
|
2010-05-09 15:52:27 +00:00
|
|
|
return 0;
|
2010-08-14 14:54:10 +00:00
|
|
|
|
|
|
|
|
error:
|
2011-10-31 08:33:37 +01:00
|
|
|
Py_DECREF(path);
|
|
|
|
|
Py_XDECREF(filename);
|
2010-08-14 14:54:10 +00:00
|
|
|
return -1;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* GC support. */
|
|
|
|
|
static int
|
|
|
|
|
zipimporter_traverse(PyObject *obj, visitproc visit, void *arg)
|
|
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
ZipImporter *self = (ZipImporter *)obj;
|
|
|
|
|
Py_VISIT(self->files);
|
|
|
|
|
return 0;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
zipimporter_dealloc(ZipImporter *self)
|
|
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
PyObject_GC_UnTrack(self);
|
|
|
|
|
Py_XDECREF(self->archive);
|
|
|
|
|
Py_XDECREF(self->prefix);
|
|
|
|
|
Py_XDECREF(self->files);
|
|
|
|
|
Py_TYPE(self)->tp_free((PyObject *)self);
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
|
zipimporter_repr(ZipImporter *self)
|
|
|
|
|
{
|
2010-08-17 00:04:48 +00:00
|
|
|
if (self->archive == NULL)
|
|
|
|
|
return PyUnicode_FromString("<zipimporter object \"???\">");
|
2011-09-28 07:41:54 +02:00
|
|
|
else if (self->prefix != NULL && PyUnicode_GET_LENGTH(self->prefix) != 0)
|
2010-10-18 22:45:54 +00:00
|
|
|
return PyUnicode_FromFormat("<zipimporter object \"%U%c%U\">",
|
2010-08-17 00:04:48 +00:00
|
|
|
self->archive, SEP, self->prefix);
|
2010-05-09 15:52:27 +00:00
|
|
|
else
|
2010-10-18 22:45:54 +00:00
|
|
|
return PyUnicode_FromFormat("<zipimporter object \"%U\">",
|
2010-08-17 00:04:48 +00:00
|
|
|
self->archive);
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* return fullname.split(".")[-1] */
|
2011-03-14 20:46:50 -04:00
|
|
|
static PyObject *
|
|
|
|
|
get_subname(PyObject *fullname)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2011-10-31 08:33:37 +01:00
|
|
|
Py_ssize_t len, dot;
|
|
|
|
|
if (PyUnicode_READY(fullname) < 0)
|
2011-09-28 07:41:54 +02:00
|
|
|
return NULL;
|
2011-10-31 08:33:37 +01:00
|
|
|
len = PyUnicode_GET_LENGTH(fullname);
|
|
|
|
|
dot = PyUnicode_FindChar(fullname, '.', 0, len, -1);
|
|
|
|
|
if (dot == -1) {
|
2011-03-14 20:46:50 -04:00
|
|
|
Py_INCREF(fullname);
|
|
|
|
|
return fullname;
|
2011-10-31 08:33:37 +01:00
|
|
|
} else
|
|
|
|
|
return PyUnicode_Substring(fullname, dot+1, len);
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given a (sub)modulename, write the potential file path in the
|
|
|
|
|
archive (without extension) to the path buffer. Return the
|
2011-03-14 20:46:50 -04:00
|
|
|
length of the resulting string.
|
|
|
|
|
|
|
|
|
|
return self.prefix + name.replace('.', os.sep) */
|
|
|
|
|
static PyObject*
|
|
|
|
|
make_filename(PyObject *prefix, PyObject *name)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2011-03-14 20:46:50 -04:00
|
|
|
PyObject *pathobj;
|
2011-09-28 07:41:54 +02:00
|
|
|
Py_UCS4 *p, *buf;
|
|
|
|
|
Py_ssize_t len;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-09-28 07:41:54 +02:00
|
|
|
len = PyUnicode_GET_LENGTH(prefix) + PyUnicode_GET_LENGTH(name) + 1;
|
2015-02-16 13:28:22 +02:00
|
|
|
p = buf = PyMem_New(Py_UCS4, len);
|
2011-09-28 07:41:54 +02:00
|
|
|
if (buf == NULL) {
|
|
|
|
|
PyErr_NoMemory();
|
2011-03-14 20:46:50 -04:00
|
|
|
return NULL;
|
2011-09-28 07:41:54 +02:00
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2012-09-10 02:00:34 +02:00
|
|
|
if (!PyUnicode_AsUCS4(prefix, p, len, 0)) {
|
|
|
|
|
PyMem_Free(buf);
|
2011-09-28 07:41:54 +02:00
|
|
|
return NULL;
|
2012-09-10 02:00:34 +02:00
|
|
|
}
|
2011-09-28 07:41:54 +02:00
|
|
|
p += PyUnicode_GET_LENGTH(prefix);
|
|
|
|
|
len -= PyUnicode_GET_LENGTH(prefix);
|
2012-09-10 02:00:34 +02:00
|
|
|
if (!PyUnicode_AsUCS4(name, p, len, 1)) {
|
|
|
|
|
PyMem_Free(buf);
|
2011-09-28 07:41:54 +02:00
|
|
|
return NULL;
|
2012-09-10 02:00:34 +02:00
|
|
|
}
|
2011-03-14 20:46:50 -04:00
|
|
|
for (; *p; p++) {
|
2010-05-09 15:52:27 +00:00
|
|
|
if (*p == '.')
|
|
|
|
|
*p = SEP;
|
|
|
|
|
}
|
2011-09-28 07:41:54 +02:00
|
|
|
pathobj = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND,
|
|
|
|
|
buf, p-buf);
|
|
|
|
|
PyMem_Free(buf);
|
2011-03-14 20:46:50 -04:00
|
|
|
return pathobj;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2004-11-10 13:08:35 +00:00
|
|
|
enum zi_module_info {
|
2010-05-09 15:52:27 +00:00
|
|
|
MI_ERROR,
|
|
|
|
|
MI_NOT_FOUND,
|
|
|
|
|
MI_MODULE,
|
|
|
|
|
MI_PACKAGE
|
2002-12-30 22:08:05 +00:00
|
|
|
};
|
|
|
|
|
|
2012-05-24 20:21:04 -04:00
|
|
|
/* Does this path represent a directory?
|
|
|
|
|
on error, return < 0
|
|
|
|
|
if not a dir, return 0
|
|
|
|
|
if a dir, return 1
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
check_is_directory(ZipImporter *self, PyObject* prefix, PyObject *path)
|
|
|
|
|
{
|
|
|
|
|
PyObject *dirpath;
|
2012-05-25 00:24:42 -07:00
|
|
|
int res;
|
2012-05-24 20:21:04 -04:00
|
|
|
|
|
|
|
|
/* See if this is a "directory". If so, it's eligible to be part
|
|
|
|
|
of a namespace package. We test by seeing if the name, with an
|
|
|
|
|
appended path separator, exists. */
|
|
|
|
|
dirpath = PyUnicode_FromFormat("%U%U%c", prefix, path, SEP);
|
|
|
|
|
if (dirpath == NULL)
|
|
|
|
|
return -1;
|
|
|
|
|
/* If dirpath is present in self->files, we have a directory. */
|
2012-05-25 00:24:42 -07:00
|
|
|
res = PyDict_Contains(self->files, dirpath);
|
2012-05-24 20:21:04 -04:00
|
|
|
Py_DECREF(dirpath);
|
2012-05-25 00:24:42 -07:00
|
|
|
return res;
|
2012-05-24 20:21:04 -04:00
|
|
|
}
|
|
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
/* Return some information about a module. */
|
2004-11-10 13:08:35 +00:00
|
|
|
static enum zi_module_info
|
2011-03-14 20:46:50 -04:00
|
|
|
get_module_info(ZipImporter *self, PyObject *fullname)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2011-03-14 20:46:50 -04:00
|
|
|
PyObject *subname;
|
|
|
|
|
PyObject *path, *fullpath, *item;
|
2010-05-09 15:52:27 +00:00
|
|
|
struct st_zip_searchorder *zso;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2017-10-20 23:42:35 +03:00
|
|
|
if (self->prefix == NULL) {
|
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
|
"zipimporter.__init__() wasn't called");
|
|
|
|
|
return MI_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-18 21:44:33 +00:00
|
|
|
subname = get_subname(fullname);
|
2011-03-14 20:46:50 -04:00
|
|
|
if (subname == NULL)
|
|
|
|
|
return MI_ERROR;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
path = make_filename(self->prefix, subname);
|
|
|
|
|
Py_DECREF(subname);
|
|
|
|
|
if (path == NULL)
|
2010-05-09 15:52:27 +00:00
|
|
|
return MI_ERROR;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
for (zso = zip_searchorder; *zso->suffix; zso++) {
|
2011-03-14 20:46:50 -04:00
|
|
|
fullpath = PyUnicode_FromFormat("%U%s", path, zso->suffix);
|
|
|
|
|
if (fullpath == NULL) {
|
|
|
|
|
Py_DECREF(path);
|
|
|
|
|
return MI_ERROR;
|
|
|
|
|
}
|
|
|
|
|
item = PyDict_GetItem(self->files, fullpath);
|
|
|
|
|
Py_DECREF(fullpath);
|
|
|
|
|
if (item != NULL) {
|
|
|
|
|
Py_DECREF(path);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (zso->type & IS_PACKAGE)
|
|
|
|
|
return MI_PACKAGE;
|
|
|
|
|
else
|
|
|
|
|
return MI_MODULE;
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-03-14 20:46:50 -04:00
|
|
|
Py_DECREF(path);
|
2010-05-09 15:52:27 +00:00
|
|
|
return MI_NOT_FOUND;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2012-05-24 22:54:15 -07:00
|
|
|
typedef enum {
|
2016-01-15 11:22:19 -08:00
|
|
|
FL_ERROR = -1, /* error */
|
|
|
|
|
FL_NOT_FOUND, /* no loader or namespace portions found */
|
|
|
|
|
FL_MODULE_FOUND, /* module/package found */
|
|
|
|
|
FL_NS_FOUND /* namespace portion found: */
|
|
|
|
|
/* *namespace_portion will point to the name */
|
2012-05-24 22:54:15 -07:00
|
|
|
} find_loader_result;
|
|
|
|
|
|
2016-01-15 11:22:19 -08:00
|
|
|
/* The guts of "find_loader" and "find_module".
|
2012-05-24 20:21:04 -04:00
|
|
|
*/
|
2012-05-24 22:54:15 -07:00
|
|
|
static find_loader_result
|
2012-05-24 20:21:04 -04:00
|
|
|
find_loader(ZipImporter *self, PyObject *fullname, PyObject **namespace_portion)
|
|
|
|
|
{
|
|
|
|
|
enum zi_module_info mi;
|
|
|
|
|
|
|
|
|
|
*namespace_portion = NULL;
|
|
|
|
|
|
|
|
|
|
mi = get_module_info(self, fullname);
|
|
|
|
|
if (mi == MI_ERROR)
|
2012-05-25 10:22:29 -07:00
|
|
|
return FL_ERROR;
|
2012-05-24 20:21:04 -04:00
|
|
|
if (mi == MI_NOT_FOUND) {
|
|
|
|
|
/* Not a module or regular package. See if this is a directory, and
|
|
|
|
|
therefore possibly a portion of a namespace package. */
|
2016-01-15 11:22:19 -08:00
|
|
|
find_loader_result result = FL_NOT_FOUND;
|
|
|
|
|
PyObject *subname;
|
|
|
|
|
int is_dir;
|
|
|
|
|
|
|
|
|
|
/* We're only interested in the last path component of fullname;
|
|
|
|
|
earlier components are recorded in self->prefix. */
|
|
|
|
|
subname = get_subname(fullname);
|
|
|
|
|
if (subname == NULL) {
|
|
|
|
|
return FL_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
is_dir = check_is_directory(self, self->prefix, subname);
|
2012-05-24 20:21:04 -04:00
|
|
|
if (is_dir < 0)
|
2016-01-15 11:22:19 -08:00
|
|
|
result = FL_ERROR;
|
|
|
|
|
else if (is_dir) {
|
2012-05-24 20:21:04 -04:00
|
|
|
/* This is possibly a portion of a namespace
|
|
|
|
|
package. Return the string representing its path,
|
|
|
|
|
without a trailing separator. */
|
|
|
|
|
*namespace_portion = PyUnicode_FromFormat("%U%c%U%U",
|
|
|
|
|
self->archive, SEP,
|
2016-01-15 11:22:19 -08:00
|
|
|
self->prefix, subname);
|
2012-05-24 20:21:04 -04:00
|
|
|
if (*namespace_portion == NULL)
|
2016-01-15 11:22:19 -08:00
|
|
|
result = FL_ERROR;
|
|
|
|
|
else
|
|
|
|
|
result = FL_NS_FOUND;
|
2012-05-24 20:21:04 -04:00
|
|
|
}
|
2016-01-15 11:22:19 -08:00
|
|
|
Py_DECREF(subname);
|
|
|
|
|
return result;
|
2012-05-24 20:21:04 -04:00
|
|
|
}
|
|
|
|
|
/* This is a module or package. */
|
2012-05-25 10:22:29 -07:00
|
|
|
return FL_MODULE_FOUND;
|
2012-05-24 20:21:04 -04:00
|
|
|
}
|
|
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
/*[clinic input]
|
|
|
|
|
zipimport.zipimporter.find_module
|
|
|
|
|
|
|
|
|
|
fullname: unicode
|
|
|
|
|
path: object = None
|
|
|
|
|
/
|
|
|
|
|
|
|
|
|
|
Search for a module specified by 'fullname'.
|
|
|
|
|
|
|
|
|
|
'fullname' must be the fully qualified (dotted) module name. It returns the
|
|
|
|
|
zipimporter instance itself if the module was found, or None if it wasn't.
|
|
|
|
|
The optional 'path' argument is ignored -- it's there for compatibility
|
|
|
|
|
with the importer protocol.
|
|
|
|
|
|
|
|
|
|
[clinic start generated code]*/
|
2012-05-24 20:21:04 -04:00
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
static PyObject *
|
2017-08-18 14:41:13 -04:00
|
|
|
zipimport_zipimporter_find_module_impl(ZipImporter *self, PyObject *fullname,
|
|
|
|
|
PyObject *path)
|
|
|
|
|
/*[clinic end generated code: output=506087f609466dc7 input=e3528520e075063f]*/
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2012-05-24 22:54:15 -07:00
|
|
|
PyObject *namespace_portion = NULL;
|
|
|
|
|
PyObject *result = NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2012-05-24 20:21:04 -04:00
|
|
|
switch (find_loader(self, fullname, &namespace_portion)) {
|
2012-05-25 10:22:29 -07:00
|
|
|
case FL_ERROR:
|
2012-05-25 00:22:04 -07:00
|
|
|
return NULL;
|
2012-05-25 10:22:29 -07:00
|
|
|
case FL_NS_FOUND:
|
2012-05-24 22:54:15 -07:00
|
|
|
/* A namespace portion is not allowed via find_module, so return None. */
|
2012-05-24 20:21:04 -04:00
|
|
|
Py_DECREF(namespace_portion);
|
2012-05-24 22:54:15 -07:00
|
|
|
/* FALL THROUGH */
|
2012-05-25 10:22:29 -07:00
|
|
|
case FL_NOT_FOUND:
|
2012-05-24 22:54:15 -07:00
|
|
|
result = Py_None;
|
|
|
|
|
break;
|
2012-05-25 10:22:29 -07:00
|
|
|
case FL_MODULE_FOUND:
|
2012-05-24 22:54:15 -07:00
|
|
|
result = (PyObject *)self;
|
|
|
|
|
break;
|
2016-01-15 11:22:19 -08:00
|
|
|
default:
|
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
|
return NULL;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2012-05-25 00:22:04 -07:00
|
|
|
Py_INCREF(result);
|
2012-05-25 00:19:40 -07:00
|
|
|
return result;
|
2012-05-24 20:21:04 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
/*[clinic input]
|
|
|
|
|
zipimport.zipimporter.find_loader
|
|
|
|
|
|
|
|
|
|
fullname: unicode
|
|
|
|
|
path: object = None
|
|
|
|
|
/
|
|
|
|
|
|
|
|
|
|
Search for a module specified by 'fullname'.
|
|
|
|
|
|
|
|
|
|
'fullname' must be the fully qualified (dotted) module name. It returns the
|
|
|
|
|
zipimporter instance itself if the module was found, a string containing the
|
|
|
|
|
full path name if it's possibly a portion of a namespace package,
|
|
|
|
|
or None otherwise. The optional 'path' argument is ignored -- it's
|
|
|
|
|
there for compatibility with the importer protocol.
|
|
|
|
|
|
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
2012-05-24 20:21:04 -04:00
|
|
|
static PyObject *
|
2017-08-18 14:41:13 -04:00
|
|
|
zipimport_zipimporter_find_loader_impl(ZipImporter *self, PyObject *fullname,
|
|
|
|
|
PyObject *path)
|
|
|
|
|
/*[clinic end generated code: output=601599a43bc0f49a input=dc73f275b0d5be23]*/
|
2012-05-24 20:21:04 -04:00
|
|
|
{
|
|
|
|
|
PyObject *result = NULL;
|
|
|
|
|
PyObject *namespace_portion = NULL;
|
|
|
|
|
|
|
|
|
|
switch (find_loader(self, fullname, &namespace_portion)) {
|
2012-05-25 10:22:29 -07:00
|
|
|
case FL_ERROR:
|
2012-05-24 22:54:15 -07:00
|
|
|
return NULL;
|
2012-05-25 10:22:29 -07:00
|
|
|
case FL_NOT_FOUND: /* Not found, return (None, []) */
|
2012-05-24 22:54:15 -07:00
|
|
|
result = Py_BuildValue("O[]", Py_None);
|
|
|
|
|
break;
|
2012-05-25 10:22:29 -07:00
|
|
|
case FL_MODULE_FOUND: /* Return (self, []) */
|
2012-05-24 22:54:15 -07:00
|
|
|
result = Py_BuildValue("O[]", self);
|
|
|
|
|
break;
|
2012-05-25 10:22:29 -07:00
|
|
|
case FL_NS_FOUND: /* Return (None, [namespace_portion]) */
|
2012-05-24 22:54:15 -07:00
|
|
|
result = Py_BuildValue("O[O]", Py_None, namespace_portion);
|
2012-05-24 22:35:39 -07:00
|
|
|
Py_DECREF(namespace_portion);
|
2012-05-24 20:21:04 -04:00
|
|
|
return result;
|
2016-01-15 11:22:19 -08:00
|
|
|
default:
|
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
|
return NULL;
|
2012-05-24 20:21:04 -04:00
|
|
|
}
|
2012-05-24 22:54:15 -07:00
|
|
|
return result;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
/*[clinic input]
|
|
|
|
|
zipimport.zipimporter.load_module
|
|
|
|
|
|
|
|
|
|
fullname: unicode
|
|
|
|
|
/
|
|
|
|
|
|
|
|
|
|
Load the module specified by 'fullname'.
|
|
|
|
|
|
|
|
|
|
'fullname' must be the fully qualified (dotted) module name. It returns the
|
|
|
|
|
imported module, or raises ZipImportError if it wasn't found.
|
|
|
|
|
|
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
static PyObject *
|
2017-08-18 14:41:13 -04:00
|
|
|
zipimport_zipimporter_load_module_impl(ZipImporter *self, PyObject *fullname)
|
|
|
|
|
/*[clinic end generated code: output=7303cebf88d47953 input=c236e2e8621f04ef]*/
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2010-10-18 12:03:25 +00:00
|
|
|
PyObject *code = NULL, *mod, *dict;
|
2011-03-14 20:46:50 -04:00
|
|
|
PyObject *modpath = NULL;
|
2010-05-09 15:52:27 +00:00
|
|
|
int ispackage;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-09-28 07:41:54 +02:00
|
|
|
if (PyUnicode_READY(fullname) == -1)
|
|
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
code = get_module_code(self, fullname, &ispackage, &modpath);
|
|
|
|
|
if (code == NULL)
|
2010-10-18 12:03:25 +00:00
|
|
|
goto error;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
mod = PyImport_AddModuleObject(fullname);
|
2010-10-18 12:03:25 +00:00
|
|
|
if (mod == NULL)
|
|
|
|
|
goto error;
|
2010-05-09 15:52:27 +00:00
|
|
|
dict = PyModule_GetDict(mod);
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
/* mod.__loader__ = self */
|
|
|
|
|
if (PyDict_SetItemString(dict, "__loader__", (PyObject *)self) != 0)
|
|
|
|
|
goto error;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
if (ispackage) {
|
|
|
|
|
/* add __path__ to the module *before* the code gets
|
|
|
|
|
executed */
|
2013-10-29 01:46:24 +01:00
|
|
|
PyObject *pkgpath, *fullpath, *subname;
|
2010-05-09 15:52:27 +00:00
|
|
|
int err;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2013-10-29 01:46:24 +01:00
|
|
|
subname = get_subname(fullname);
|
|
|
|
|
if (subname == NULL)
|
|
|
|
|
goto error;
|
|
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
fullpath = PyUnicode_FromFormat("%U%c%U%U",
|
2010-05-09 15:52:27 +00:00
|
|
|
self->archive, SEP,
|
|
|
|
|
self->prefix, subname);
|
2011-03-14 20:46:50 -04:00
|
|
|
Py_DECREF(subname);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (fullpath == NULL)
|
|
|
|
|
goto error;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
pkgpath = Py_BuildValue("[N]", fullpath);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (pkgpath == NULL)
|
|
|
|
|
goto error;
|
|
|
|
|
err = PyDict_SetItemString(dict, "__path__", pkgpath);
|
|
|
|
|
Py_DECREF(pkgpath);
|
|
|
|
|
if (err != 0)
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
2011-03-14 20:46:50 -04:00
|
|
|
mod = PyImport_ExecCodeModuleObject(fullname, code, modpath, NULL);
|
2010-10-18 12:03:25 +00:00
|
|
|
Py_CLEAR(code);
|
|
|
|
|
if (mod == NULL)
|
|
|
|
|
goto error;
|
|
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
if (Py_VerboseFlag)
|
2011-03-14 20:46:50 -04:00
|
|
|
PySys_FormatStderr("import %U # loaded from Zip %U\n",
|
2010-10-18 12:09:02 +00:00
|
|
|
fullname, modpath);
|
|
|
|
|
Py_DECREF(modpath);
|
2010-05-09 15:52:27 +00:00
|
|
|
return mod;
|
2002-12-30 22:08:05 +00:00
|
|
|
error:
|
2010-10-18 12:03:25 +00:00
|
|
|
Py_XDECREF(code);
|
2010-10-18 12:09:02 +00:00
|
|
|
Py_XDECREF(modpath);
|
2010-05-09 15:52:27 +00:00
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
/*[clinic input]
|
|
|
|
|
zipimport.zipimporter.get_filename
|
2008-12-14 11:50:48 +00:00
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
fullname: unicode
|
|
|
|
|
/
|
|
|
|
|
|
|
|
|
|
Return the filename for the specified module.
|
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
|
zipimport_zipimporter_get_filename_impl(ZipImporter *self,
|
|
|
|
|
PyObject *fullname)
|
|
|
|
|
/*[clinic end generated code: output=c5b92b58bea86506 input=28d2eb57e4f25c8a]*/
|
|
|
|
|
{
|
|
|
|
|
PyObject *code, *modpath;
|
|
|
|
|
int ispackage;
|
2008-12-14 11:50:48 +00:00
|
|
|
|
|
|
|
|
/* Deciding the filename requires working out where the code
|
|
|
|
|
would come from if the module was actually loaded */
|
|
|
|
|
code = get_module_code(self, fullname, &ispackage, &modpath);
|
|
|
|
|
if (code == NULL)
|
2010-10-18 11:39:05 +00:00
|
|
|
return NULL;
|
2008-12-14 11:50:48 +00:00
|
|
|
Py_DECREF(code); /* Only need the path info */
|
|
|
|
|
|
2010-10-18 12:09:02 +00:00
|
|
|
return modpath;
|
2008-12-14 11:50:48 +00:00
|
|
|
}
|
|
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
/*[clinic input]
|
|
|
|
|
zipimport.zipimporter.is_package
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
fullname: unicode
|
|
|
|
|
/
|
|
|
|
|
|
|
|
|
|
Return True if the module specified by fullname is a package.
|
|
|
|
|
|
|
|
|
|
Raise ZipImportError if the module couldn't be found.
|
|
|
|
|
|
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
|
zipimport_zipimporter_is_package_impl(ZipImporter *self, PyObject *fullname)
|
|
|
|
|
/*[clinic end generated code: output=c32958c2a5216ae6 input=a7ba752f64345062]*/
|
|
|
|
|
{
|
|
|
|
|
enum zi_module_info mi;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
mi = get_module_info(self, fullname);
|
|
|
|
|
if (mi == MI_ERROR)
|
2010-10-18 21:44:33 +00:00
|
|
|
return NULL;
|
2010-05-09 15:52:27 +00:00
|
|
|
if (mi == MI_NOT_FOUND) {
|
2011-03-14 20:46:50 -04:00
|
|
|
PyErr_Format(ZipImportError, "can't find module %R", fullname);
|
2010-10-18 21:44:33 +00:00
|
|
|
return NULL;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
|
|
|
|
return PyBool_FromLong(mi == MI_PACKAGE);
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2011-09-28 07:41:54 +02:00
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
/*[clinic input]
|
|
|
|
|
zipimport.zipimporter.get_data
|
|
|
|
|
|
|
|
|
|
pathname as path: unicode
|
|
|
|
|
/
|
|
|
|
|
|
|
|
|
|
Return the data associated with 'pathname'.
|
|
|
|
|
|
|
|
|
|
Raise OSError if the file was not found.
|
|
|
|
|
|
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
static PyObject *
|
2017-08-18 14:41:13 -04:00
|
|
|
zipimport_zipimporter_get_data_impl(ZipImporter *self, PyObject *path)
|
|
|
|
|
/*[clinic end generated code: output=65dc506aaa268436 input=fa6428b74843c4ae]*/
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2017-08-18 14:41:13 -04:00
|
|
|
PyObject *key;
|
2014-02-16 14:17:28 -05:00
|
|
|
PyObject *toc_entry;
|
2011-10-31 08:33:37 +01:00
|
|
|
Py_ssize_t path_start, path_len, len;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2017-10-20 23:42:35 +03:00
|
|
|
if (self->archive == NULL) {
|
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
|
"zipimporter.__init__() wasn't called");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-28 07:41:54 +02:00
|
|
|
#ifdef ALTSEP
|
2017-08-29 20:40:15 +03:00
|
|
|
path = _PyObject_CallMethodId((PyObject *)&PyUnicode_Type, &PyId_replace,
|
|
|
|
|
"OCC", path, ALTSEP, SEP);
|
2011-10-31 08:33:37 +01:00
|
|
|
if (!path)
|
|
|
|
|
return NULL;
|
|
|
|
|
#else
|
|
|
|
|
Py_INCREF(path);
|
2002-12-30 22:08:05 +00:00
|
|
|
#endif
|
2011-10-31 08:33:37 +01:00
|
|
|
if (PyUnicode_READY(path) == -1)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
path_len = PyUnicode_GET_LENGTH(path);
|
|
|
|
|
|
2011-09-28 07:41:54 +02:00
|
|
|
len = PyUnicode_GET_LENGTH(self->archive);
|
2011-10-31 08:33:37 +01:00
|
|
|
path_start = 0;
|
|
|
|
|
if (PyUnicode_Tailmatch(path, self->archive, 0, len, -1)
|
|
|
|
|
&& PyUnicode_READ_CHAR(path, len) == SEP) {
|
|
|
|
|
path_start = len + 1;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-10-31 08:33:37 +01:00
|
|
|
key = PyUnicode_Substring(path, path_start, path_len);
|
2010-08-16 23:48:11 +00:00
|
|
|
if (key == NULL)
|
2011-10-31 08:33:37 +01:00
|
|
|
goto error;
|
2010-08-16 23:48:11 +00:00
|
|
|
toc_entry = PyDict_GetItem(self->files, key);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (toc_entry == NULL) {
|
2017-04-16 10:46:38 +03:00
|
|
|
PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, key);
|
2010-08-16 23:48:11 +00:00
|
|
|
Py_DECREF(key);
|
2011-10-31 08:33:37 +01:00
|
|
|
goto error;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2010-08-16 23:48:11 +00:00
|
|
|
Py_DECREF(key);
|
2011-10-31 08:33:37 +01:00
|
|
|
Py_DECREF(path);
|
2014-02-16 14:17:28 -05:00
|
|
|
return get_data(self->archive, toc_entry);
|
2011-10-31 08:33:37 +01:00
|
|
|
error:
|
|
|
|
|
Py_DECREF(path);
|
|
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
/*[clinic input]
|
|
|
|
|
zipimport.zipimporter.get_code
|
|
|
|
|
|
|
|
|
|
fullname: unicode
|
|
|
|
|
/
|
|
|
|
|
|
|
|
|
|
Return the code object for the specified module.
|
|
|
|
|
|
|
|
|
|
Raise ZipImportError if the module couldn't be found.
|
|
|
|
|
|
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
static PyObject *
|
2017-08-18 14:41:13 -04:00
|
|
|
zipimport_zipimporter_get_code_impl(ZipImporter *self, PyObject *fullname)
|
|
|
|
|
/*[clinic end generated code: output=b923c37fa99cbac4 input=2761412bc37f3549]*/
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
return get_module_code(self, fullname, NULL, NULL);
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
/*[clinic input]
|
|
|
|
|
zipimport.zipimporter.get_source
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2017-08-18 14:41:13 -04:00
|
|
|
fullname: unicode
|
|
|
|
|
/
|
|
|
|
|
|
|
|
|
|
Return the source code for the specified module.
|
|
|
|
|
|
|
|
|
|
Raise ZipImportError if the module couldn't be found, return None if the
|
|
|
|
|
archive does contain the module, but has no source for it.
|
|
|
|
|
|
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
|
zipimport_zipimporter_get_source_impl(ZipImporter *self, PyObject *fullname)
|
|
|
|
|
/*[clinic end generated code: output=bc059301b0c33729 input=4e4b186f2e690716]*/
|
|
|
|
|
{
|
|
|
|
|
PyObject *toc_entry;
|
|
|
|
|
PyObject *subname, *path, *fullpath;
|
|
|
|
|
enum zi_module_info mi;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
mi = get_module_info(self, fullname);
|
2010-10-18 21:44:33 +00:00
|
|
|
if (mi == MI_ERROR)
|
2010-05-09 15:52:27 +00:00
|
|
|
return NULL;
|
2010-10-18 20:44:08 +00:00
|
|
|
if (mi == MI_NOT_FOUND) {
|
2011-03-14 20:46:50 -04:00
|
|
|
PyErr_Format(ZipImportError, "can't find module %R", fullname);
|
2010-10-18 20:44:08 +00:00
|
|
|
return NULL;
|
|
|
|
|
}
|
2011-03-14 20:46:50 -04:00
|
|
|
|
2010-10-18 21:44:33 +00:00
|
|
|
subname = get_subname(fullname);
|
2011-03-14 20:46:50 -04:00
|
|
|
if (subname == NULL)
|
2010-05-09 15:52:27 +00:00
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
path = make_filename(self->prefix, subname);
|
|
|
|
|
Py_DECREF(subname);
|
|
|
|
|
if (path == NULL)
|
|
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
if (mi == MI_PACKAGE)
|
|
|
|
|
fullpath = PyUnicode_FromFormat("%U%c__init__.py", path, SEP);
|
|
|
|
|
else
|
|
|
|
|
fullpath = PyUnicode_FromFormat("%U.py", path);
|
|
|
|
|
Py_DECREF(path);
|
|
|
|
|
if (fullpath == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
toc_entry = PyDict_GetItem(self->files, fullpath);
|
|
|
|
|
Py_DECREF(fullpath);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (toc_entry != NULL) {
|
2010-08-16 23:48:11 +00:00
|
|
|
PyObject *res, *bytes;
|
2014-02-16 14:17:28 -05:00
|
|
|
bytes = get_data(self->archive, toc_entry);
|
2010-08-16 23:48:11 +00:00
|
|
|
if (bytes == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
res = PyUnicode_FromStringAndSize(PyBytes_AS_STRING(bytes),
|
|
|
|
|
PyBytes_GET_SIZE(bytes));
|
|
|
|
|
Py_DECREF(bytes);
|
2010-05-09 15:52:27 +00:00
|
|
|
return res;
|
|
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
/* we have the module, but no source */
|
2017-01-23 09:47:21 +02:00
|
|
|
Py_RETURN_NONE;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2018-01-24 15:36:21 -05:00
|
|
|
/*[clinic input]
|
|
|
|
|
zipimport.zipimporter.get_resource_reader
|
|
|
|
|
|
|
|
|
|
fullname: unicode
|
|
|
|
|
/
|
|
|
|
|
|
|
|
|
|
Return the ResourceReader for a package in a zip file.
|
|
|
|
|
|
|
|
|
|
If 'fullname' is a package within the zip file, return the 'ResourceReader'
|
|
|
|
|
object for the package. Otherwise return None.
|
|
|
|
|
|
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
|
zipimport_zipimporter_get_resource_reader_impl(ZipImporter *self,
|
|
|
|
|
PyObject *fullname)
|
|
|
|
|
/*[clinic end generated code: output=5e367d431f830726 input=bfab94d736e99151]*/
|
|
|
|
|
{
|
|
|
|
|
PyObject *module = PyImport_ImportModule("importlib.resources");
|
|
|
|
|
if (module == NULL) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
PyObject *retval = PyObject_CallMethod(
|
|
|
|
|
module, "_zipimport_get_resource_reader",
|
|
|
|
|
"OO", (PyObject *)self, fullname);
|
|
|
|
|
Py_DECREF(module);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
2008-12-14 11:50:48 +00:00
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
static PyMethodDef zipimporter_methods[] = {
|
2017-08-18 14:41:13 -04:00
|
|
|
ZIPIMPORT_ZIPIMPORTER_FIND_MODULE_METHODDEF
|
|
|
|
|
ZIPIMPORT_ZIPIMPORTER_FIND_LOADER_METHODDEF
|
|
|
|
|
ZIPIMPORT_ZIPIMPORTER_LOAD_MODULE_METHODDEF
|
|
|
|
|
ZIPIMPORT_ZIPIMPORTER_GET_FILENAME_METHODDEF
|
|
|
|
|
ZIPIMPORT_ZIPIMPORTER_IS_PACKAGE_METHODDEF
|
|
|
|
|
ZIPIMPORT_ZIPIMPORTER_GET_DATA_METHODDEF
|
|
|
|
|
ZIPIMPORT_ZIPIMPORTER_GET_CODE_METHODDEF
|
|
|
|
|
ZIPIMPORT_ZIPIMPORTER_GET_SOURCE_METHODDEF
|
2018-01-24 15:36:21 -05:00
|
|
|
ZIPIMPORT_ZIPIMPORTER_GET_RESOURCE_READER_METHODDEF
|
2010-05-09 15:52:27 +00:00
|
|
|
{NULL, NULL} /* sentinel */
|
2002-12-30 22:08:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static PyMemberDef zipimporter_members[] = {
|
2010-05-09 15:52:27 +00:00
|
|
|
{"archive", T_OBJECT, offsetof(ZipImporter, archive), READONLY},
|
|
|
|
|
{"prefix", T_OBJECT, offsetof(ZipImporter, prefix), READONLY},
|
|
|
|
|
{"_files", T_OBJECT, offsetof(ZipImporter, files), READONLY},
|
|
|
|
|
{NULL}
|
2002-12-30 22:08:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define DEFERRED_ADDRESS(ADDR) 0
|
|
|
|
|
|
|
|
|
|
static PyTypeObject ZipImporter_Type = {
|
2010-05-09 15:52:27 +00:00
|
|
|
PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
|
|
|
|
|
"zipimport.zipimporter",
|
|
|
|
|
sizeof(ZipImporter),
|
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
|
(destructor)zipimporter_dealloc, /* tp_dealloc */
|
|
|
|
|
0, /* tp_print */
|
|
|
|
|
0, /* tp_getattr */
|
|
|
|
|
0, /* tp_setattr */
|
|
|
|
|
0, /* tp_reserved */
|
|
|
|
|
(reprfunc)zipimporter_repr, /* tp_repr */
|
|
|
|
|
0, /* tp_as_number */
|
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
|
0, /* tp_hash */
|
|
|
|
|
0, /* tp_call */
|
|
|
|
|
0, /* tp_str */
|
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
|
0, /* tp_setattro */
|
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
|
|
|
|
|
Py_TPFLAGS_HAVE_GC, /* tp_flags */
|
2017-08-18 14:41:13 -04:00
|
|
|
zipimport_zipimporter___init____doc__, /* tp_doc */
|
2010-05-09 15:52:27 +00:00
|
|
|
zipimporter_traverse, /* tp_traverse */
|
|
|
|
|
0, /* tp_clear */
|
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
|
0, /* tp_iter */
|
|
|
|
|
0, /* tp_iternext */
|
|
|
|
|
zipimporter_methods, /* tp_methods */
|
|
|
|
|
zipimporter_members, /* tp_members */
|
|
|
|
|
0, /* tp_getset */
|
|
|
|
|
0, /* tp_base */
|
|
|
|
|
0, /* tp_dict */
|
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
|
0, /* tp_dictoffset */
|
2017-08-18 14:41:13 -04:00
|
|
|
(initproc)zipimport_zipimporter___init__, /* tp_init */
|
2010-05-09 15:52:27 +00:00
|
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
|
|
|
PyType_GenericNew, /* tp_new */
|
|
|
|
|
PyObject_GC_Del, /* tp_free */
|
2002-12-30 22:08:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* implementation */
|
|
|
|
|
|
2016-01-28 21:30:16 +02:00
|
|
|
/* Given a buffer, return the unsigned int that is represented by the first
|
2002-12-30 22:08:05 +00:00
|
|
|
4 bytes, encoded as little endian. This partially reimplements
|
|
|
|
|
marshal.c:r_long() */
|
2016-01-28 21:30:16 +02:00
|
|
|
static unsigned int
|
|
|
|
|
get_uint32(const unsigned char *buf)
|
|
|
|
|
{
|
|
|
|
|
unsigned int x;
|
2010-05-09 15:52:27 +00:00
|
|
|
x = buf[0];
|
2016-01-28 21:30:16 +02:00
|
|
|
x |= (unsigned int)buf[1] << 8;
|
|
|
|
|
x |= (unsigned int)buf[2] << 16;
|
|
|
|
|
x |= (unsigned int)buf[3] << 24;
|
2010-05-09 15:52:27 +00:00
|
|
|
return x;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2016-01-28 21:30:16 +02:00
|
|
|
/* Given a buffer, return the unsigned int that is represented by the first
|
|
|
|
|
2 bytes, encoded as little endian. This partially reimplements
|
|
|
|
|
marshal.c:r_short() */
|
|
|
|
|
static unsigned short
|
|
|
|
|
get_uint16(const unsigned char *buf)
|
|
|
|
|
{
|
|
|
|
|
unsigned short x;
|
|
|
|
|
x = buf[0];
|
|
|
|
|
x |= (unsigned short)buf[1] << 8;
|
|
|
|
|
return x;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_file_error(PyObject *archive, int eof)
|
|
|
|
|
{
|
|
|
|
|
if (eof) {
|
|
|
|
|
PyErr_SetString(PyExc_EOFError, "EOF read where not expected");
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, archive);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-01-07 18:30:07 -08:00
|
|
|
/*
|
2014-02-16 14:17:28 -05:00
|
|
|
read_directory(archive) -> files dict (new reference)
|
2014-01-07 18:30:07 -08:00
|
|
|
|
2014-02-16 14:17:28 -05:00
|
|
|
Given a path to a Zip archive, build a dict, mapping file names
|
2002-12-30 22:08:05 +00:00
|
|
|
(local to the archive, using SEP as a separator) to toc entries.
|
|
|
|
|
|
|
|
|
|
A toc_entry is a tuple:
|
|
|
|
|
|
2010-10-18 12:09:02 +00:00
|
|
|
(__file__, # value to use for __file__, available for all files,
|
|
|
|
|
# encoded to the filesystem encoding
|
2010-05-09 15:52:27 +00:00
|
|
|
compress, # compression kind; 0 for uncompressed
|
|
|
|
|
data_size, # size of compressed data on disk
|
|
|
|
|
file_size, # size of decompressed data
|
|
|
|
|
file_offset, # offset of file header from start of archive
|
|
|
|
|
time, # mod time of file (in dos format)
|
|
|
|
|
date, # mod data of file (in dos format)
|
|
|
|
|
crc, # crc checksum of the data
|
2010-10-18 11:39:05 +00:00
|
|
|
)
|
2002-12-30 22:08:05 +00:00
|
|
|
|
|
|
|
|
Directories can be recognized by the trailing SEP in the name,
|
|
|
|
|
data_size and file_offset are 0.
|
|
|
|
|
*/
|
|
|
|
|
static PyObject *
|
2014-02-16 14:17:28 -05:00
|
|
|
read_directory(PyObject *archive)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
PyObject *files = NULL;
|
2014-02-16 14:17:28 -05:00
|
|
|
FILE *fp;
|
2016-01-28 21:30:16 +02:00
|
|
|
unsigned short flags, compress, time, date, name_size;
|
|
|
|
|
unsigned int crc, data_size, file_size, header_size, header_offset;
|
|
|
|
|
unsigned long file_offset, header_position;
|
|
|
|
|
unsigned long arc_offset; /* Absolute offset to start of the zip-archive. */
|
|
|
|
|
unsigned int count, i;
|
|
|
|
|
unsigned char buffer[46];
|
2010-05-09 15:52:27 +00:00
|
|
|
char name[MAXPATHLEN + 5];
|
2010-08-16 17:54:28 +00:00
|
|
|
PyObject *nameobj = NULL;
|
2011-10-31 08:33:37 +01:00
|
|
|
PyObject *path;
|
2010-10-18 12:13:46 +00:00
|
|
|
const char *charset;
|
2011-01-22 10:30:29 +00:00
|
|
|
int bootstrap;
|
2016-01-28 21:30:16 +02:00
|
|
|
const char *errmsg = NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2014-02-16 14:17:28 -05:00
|
|
|
fp = _Py_fopen_obj(archive, "rb");
|
|
|
|
|
if (fp == NULL) {
|
2015-03-20 10:52:25 +01:00
|
|
|
if (PyErr_ExceptionMatches(PyExc_OSError)) {
|
2016-10-21 17:09:17 +03:00
|
|
|
_PyErr_FormatFromCause(ZipImportError,
|
|
|
|
|
"can't open Zip file: %R", archive);
|
2015-03-20 10:52:25 +01:00
|
|
|
}
|
2014-02-16 14:17:28 -05:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2012-10-03 02:13:05 +02:00
|
|
|
if (fseek(fp, -22, SEEK_END) == -1) {
|
2016-01-28 21:30:16 +02:00
|
|
|
goto file_error;
|
2012-10-03 02:13:05 +02:00
|
|
|
}
|
2016-01-28 21:30:16 +02:00
|
|
|
header_position = (unsigned long)ftell(fp);
|
|
|
|
|
if (header_position == (unsigned long)-1) {
|
|
|
|
|
goto file_error;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2016-01-28 21:30:16 +02:00
|
|
|
assert(header_position <= (unsigned long)LONG_MAX);
|
|
|
|
|
if (fread(buffer, 1, 22, fp) != 22) {
|
|
|
|
|
goto file_error;
|
|
|
|
|
}
|
|
|
|
|
if (get_uint32(buffer) != 0x06054B50u) {
|
2010-05-09 15:52:27 +00:00
|
|
|
/* Bad: End of Central Dir signature */
|
2016-01-28 21:30:16 +02:00
|
|
|
errmsg = "not a Zip file";
|
|
|
|
|
goto invalid_header;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2016-01-28 21:30:16 +02:00
|
|
|
header_size = get_uint32(buffer + 12);
|
|
|
|
|
header_offset = get_uint32(buffer + 16);
|
|
|
|
|
if (header_position < header_size) {
|
|
|
|
|
errmsg = "bad central directory size";
|
|
|
|
|
goto invalid_header;
|
|
|
|
|
}
|
|
|
|
|
if (header_position < header_offset) {
|
|
|
|
|
errmsg = "bad central directory offset";
|
|
|
|
|
goto invalid_header;
|
|
|
|
|
}
|
|
|
|
|
if (header_position - header_size < header_offset) {
|
|
|
|
|
errmsg = "bad central directory size or offset";
|
|
|
|
|
goto invalid_header;
|
|
|
|
|
}
|
|
|
|
|
header_position -= header_size;
|
|
|
|
|
arc_offset = header_position - header_offset;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
files = PyDict_New();
|
2016-01-28 21:30:16 +02:00
|
|
|
if (files == NULL) {
|
2010-05-09 15:52:27 +00:00
|
|
|
goto error;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
/* Start of Central Directory */
|
|
|
|
|
count = 0;
|
2016-01-28 21:30:16 +02:00
|
|
|
if (fseek(fp, (long)header_position, 0) == -1) {
|
2013-02-16 17:43:45 +02:00
|
|
|
goto file_error;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
for (;;) {
|
|
|
|
|
PyObject *t;
|
2016-01-28 21:30:16 +02:00
|
|
|
size_t n;
|
2010-05-09 15:52:27 +00:00
|
|
|
int err;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2016-01-28 21:30:16 +02:00
|
|
|
n = fread(buffer, 1, 46, fp);
|
|
|
|
|
if (n < 4) {
|
|
|
|
|
goto eof_error;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2016-01-28 21:30:16 +02:00
|
|
|
/* Start of file header */
|
|
|
|
|
if (get_uint32(buffer) != 0x02014B50u) {
|
|
|
|
|
break; /* Bad: Central Dir File Header */
|
|
|
|
|
}
|
|
|
|
|
if (n != 46) {
|
|
|
|
|
goto eof_error;
|
|
|
|
|
}
|
|
|
|
|
flags = get_uint16(buffer + 8);
|
|
|
|
|
compress = get_uint16(buffer + 10);
|
|
|
|
|
time = get_uint16(buffer + 12);
|
|
|
|
|
date = get_uint16(buffer + 14);
|
|
|
|
|
crc = get_uint32(buffer + 16);
|
|
|
|
|
data_size = get_uint32(buffer + 20);
|
|
|
|
|
file_size = get_uint32(buffer + 24);
|
|
|
|
|
name_size = get_uint16(buffer + 28);
|
|
|
|
|
header_size = (unsigned int)name_size +
|
|
|
|
|
get_uint16(buffer + 30) /* extra field */ +
|
|
|
|
|
get_uint16(buffer + 32) /* comment */;
|
|
|
|
|
|
|
|
|
|
file_offset = get_uint32(buffer + 42);
|
|
|
|
|
if (file_offset > header_offset) {
|
|
|
|
|
errmsg = "bad local header offset";
|
|
|
|
|
goto invalid_header;
|
|
|
|
|
}
|
|
|
|
|
file_offset += arc_offset;
|
|
|
|
|
|
|
|
|
|
if (name_size > MAXPATHLEN) {
|
|
|
|
|
name_size = MAXPATHLEN;
|
|
|
|
|
}
|
|
|
|
|
if (fread(name, 1, name_size, fp) != name_size) {
|
|
|
|
|
goto file_error;
|
|
|
|
|
}
|
|
|
|
|
name[name_size] = '\0'; /* Add terminating null byte */
|
2016-12-05 17:55:36 +01:00
|
|
|
#if SEP != '/'
|
|
|
|
|
for (i = 0; i < name_size; i++) {
|
|
|
|
|
if (name[i] == '/') {
|
|
|
|
|
name[i] = SEP;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
|
|
|
|
}
|
2016-12-05 17:55:36 +01:00
|
|
|
#endif
|
2016-01-28 21:30:16 +02:00
|
|
|
/* Skip the rest of the header.
|
|
|
|
|
* On Windows, calling fseek to skip over the fields we don't use is
|
|
|
|
|
* slower than reading the data because fseek flushes stdio's
|
|
|
|
|
* internal buffers. See issue #8745. */
|
|
|
|
|
assert(header_size <= 3*0xFFFFu);
|
|
|
|
|
for (i = name_size; i < header_size; i++) {
|
|
|
|
|
if (getc(fp) == EOF) {
|
2013-02-16 17:43:45 +02:00
|
|
|
goto file_error;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
|
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-01-22 10:30:29 +00:00
|
|
|
bootstrap = 0;
|
2016-01-28 21:30:16 +02:00
|
|
|
if (flags & 0x0800) {
|
2010-10-18 12:13:46 +00:00
|
|
|
charset = "utf-8";
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2011-01-22 10:30:29 +00:00
|
|
|
else if (!PyThreadState_GET()->interp->codecs_initialized) {
|
|
|
|
|
/* During bootstrap, we may need to load the encodings
|
|
|
|
|
package from a ZIP file. But the cp437 encoding is implemented
|
|
|
|
|
in Python in the encodings package.
|
|
|
|
|
|
|
|
|
|
Break out of this dependency by assuming that the path to
|
|
|
|
|
the encodings module is ASCII-only. */
|
|
|
|
|
charset = "ascii";
|
|
|
|
|
bootstrap = 1;
|
|
|
|
|
}
|
2016-01-28 21:30:16 +02:00
|
|
|
else {
|
2010-10-18 12:13:46 +00:00
|
|
|
charset = "cp437";
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2010-10-18 12:13:46 +00:00
|
|
|
nameobj = PyUnicode_Decode(name, name_size, charset, NULL);
|
2011-01-22 10:30:29 +00:00
|
|
|
if (nameobj == NULL) {
|
2016-01-28 21:30:16 +02:00
|
|
|
if (bootstrap) {
|
2011-01-22 10:30:29 +00:00
|
|
|
PyErr_Format(PyExc_NotImplementedError,
|
|
|
|
|
"bootstrap issue: python%i%i.zip contains non-ASCII "
|
|
|
|
|
"filenames without the unicode flag",
|
|
|
|
|
PY_MAJOR_VERSION, PY_MINOR_VERSION);
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2010-08-16 17:54:28 +00:00
|
|
|
goto error;
|
2011-01-22 10:30:29 +00:00
|
|
|
}
|
2016-01-28 21:30:16 +02:00
|
|
|
if (PyUnicode_READY(nameobj) == -1) {
|
2012-08-20 14:14:49 +02:00
|
|
|
goto error;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2011-10-31 08:33:37 +01:00
|
|
|
path = PyUnicode_FromFormat("%U%c%U", archive, SEP, nameobj);
|
2016-01-28 21:30:16 +02:00
|
|
|
if (path == NULL) {
|
2010-08-16 17:54:28 +00:00
|
|
|
goto error;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
|
|
|
|
t = Py_BuildValue("NHIIkHHI", path, compress, data_size,
|
2010-05-09 15:52:27 +00:00
|
|
|
file_size, file_offset, time, date, crc);
|
2016-01-28 21:30:16 +02:00
|
|
|
if (t == NULL) {
|
2010-05-09 15:52:27 +00:00
|
|
|
goto error;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2010-08-16 17:54:28 +00:00
|
|
|
err = PyDict_SetItem(files, nameobj, t);
|
|
|
|
|
Py_CLEAR(nameobj);
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_DECREF(t);
|
2016-01-28 21:30:16 +02:00
|
|
|
if (err != 0) {
|
2010-05-09 15:52:27 +00:00
|
|
|
goto error;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
count++;
|
|
|
|
|
}
|
2014-02-16 14:17:28 -05:00
|
|
|
fclose(fp);
|
2016-01-28 21:30:16 +02:00
|
|
|
if (Py_VerboseFlag) {
|
|
|
|
|
PySys_FormatStderr("# zipimport: found %u names in %R\n",
|
2011-03-14 20:46:50 -04:00
|
|
|
count, archive);
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
return files;
|
2016-01-28 21:30:16 +02:00
|
|
|
|
|
|
|
|
eof_error:
|
|
|
|
|
set_file_error(archive, !ferror(fp));
|
|
|
|
|
goto error;
|
|
|
|
|
|
2013-02-16 17:43:45 +02:00
|
|
|
file_error:
|
2012-10-03 02:13:05 +02:00
|
|
|
PyErr_Format(ZipImportError, "can't read Zip file: %R", archive);
|
2016-01-28 21:30:16 +02:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
invalid_header:
|
|
|
|
|
assert(errmsg != NULL);
|
|
|
|
|
PyErr_Format(ZipImportError, "%s: %R", errmsg, archive);
|
|
|
|
|
goto error;
|
|
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
error:
|
2014-02-16 14:17:28 -05:00
|
|
|
fclose(fp);
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_XDECREF(files);
|
2010-08-16 17:54:28 +00:00
|
|
|
Py_XDECREF(nameobj);
|
2010-05-09 15:52:27 +00:00
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the zlib.decompress function object, or NULL if zlib couldn't
|
|
|
|
|
be imported. The function is cached when found, so subsequent calls
|
2011-05-20 00:16:09 +02:00
|
|
|
don't import zlib again. */
|
2002-12-30 22:08:05 +00:00
|
|
|
static PyObject *
|
|
|
|
|
get_decompress_func(void)
|
|
|
|
|
{
|
2011-05-20 00:16:09 +02:00
|
|
|
static int importing_zlib = 0;
|
|
|
|
|
PyObject *zlib;
|
|
|
|
|
PyObject *decompress;
|
2011-10-14 10:20:37 +02:00
|
|
|
_Py_IDENTIFIER(decompress);
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-05-20 00:16:09 +02:00
|
|
|
if (importing_zlib != 0)
|
2017-03-11 13:02:52 +08:00
|
|
|
/* Someone has a zlib.pyc in their Zip file;
|
2011-05-20 00:16:09 +02:00
|
|
|
let's avoid a stack overflow. */
|
|
|
|
|
return NULL;
|
|
|
|
|
importing_zlib = 1;
|
|
|
|
|
zlib = PyImport_ImportModuleNoBlock("zlib");
|
|
|
|
|
importing_zlib = 0;
|
|
|
|
|
if (zlib != NULL) {
|
2011-10-10 18:11:30 +02:00
|
|
|
decompress = _PyObject_GetAttrId(zlib,
|
|
|
|
|
&PyId_decompress);
|
2011-05-20 00:16:09 +02:00
|
|
|
Py_DECREF(zlib);
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2011-05-20 00:16:09 +02:00
|
|
|
else {
|
|
|
|
|
PyErr_Clear();
|
|
|
|
|
decompress = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (Py_VerboseFlag)
|
|
|
|
|
PySys_WriteStderr("# zipimport: zlib %s\n",
|
|
|
|
|
zlib != NULL ? "available": "UNAVAILABLE");
|
2010-05-09 15:52:27 +00:00
|
|
|
return decompress;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2014-02-16 14:17:28 -05:00
|
|
|
/* Given a path to a Zip file and a toc_entry, return the (uncompressed)
|
2002-12-30 22:08:05 +00:00
|
|
|
data as a new reference. */
|
|
|
|
|
static PyObject *
|
2014-02-16 14:17:28 -05:00
|
|
|
get_data(PyObject *archive, PyObject *toc_entry)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2016-01-28 21:30:16 +02:00
|
|
|
PyObject *raw_data = NULL, *data, *decompress;
|
2010-05-09 15:52:27 +00:00
|
|
|
char *buf;
|
2014-02-16 14:17:28 -05:00
|
|
|
FILE *fp;
|
2010-08-16 23:48:11 +00:00
|
|
|
PyObject *datapath;
|
2016-01-28 21:30:16 +02:00
|
|
|
unsigned short compress, time, date;
|
|
|
|
|
unsigned int crc;
|
|
|
|
|
Py_ssize_t data_size, file_size, bytes_size;
|
|
|
|
|
long file_offset, header_size;
|
|
|
|
|
unsigned char buffer[30];
|
|
|
|
|
const char *errmsg = NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2016-01-28 21:30:16 +02:00
|
|
|
if (!PyArg_ParseTuple(toc_entry, "OHnnlHHI", &datapath, &compress,
|
2010-05-09 15:52:27 +00:00
|
|
|
&data_size, &file_size, &file_offset, &time,
|
|
|
|
|
&date, &crc)) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2016-01-21 22:02:46 -08:00
|
|
|
if (data_size < 0) {
|
|
|
|
|
PyErr_Format(ZipImportError, "negative data size");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2014-02-16 14:17:28 -05:00
|
|
|
fp = _Py_fopen_obj(archive, "rb");
|
2016-01-28 21:30:16 +02:00
|
|
|
if (!fp) {
|
2014-02-16 14:17:28 -05:00
|
|
|
return NULL;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
/* Check to make sure the local file header is correct */
|
2012-10-03 02:13:05 +02:00
|
|
|
if (fseek(fp, file_offset, 0) == -1) {
|
2016-01-28 21:30:16 +02:00
|
|
|
goto file_error;
|
2012-10-03 02:13:05 +02:00
|
|
|
}
|
2016-01-28 21:30:16 +02:00
|
|
|
if (fread(buffer, 1, 30, fp) != 30) {
|
|
|
|
|
goto eof_error;
|
|
|
|
|
}
|
|
|
|
|
if (get_uint32(buffer) != 0x04034B50u) {
|
2010-05-09 15:52:27 +00:00
|
|
|
/* Bad: Local File Header */
|
2016-01-28 21:30:16 +02:00
|
|
|
errmsg = "bad local file header";
|
|
|
|
|
goto invalid_header;
|
2012-10-03 02:13:05 +02:00
|
|
|
}
|
|
|
|
|
|
2016-01-28 21:30:16 +02:00
|
|
|
header_size = (unsigned int)30 +
|
|
|
|
|
get_uint16(buffer + 26) /* file name */ +
|
|
|
|
|
get_uint16(buffer + 28) /* extra field */;
|
|
|
|
|
if (file_offset > LONG_MAX - header_size) {
|
|
|
|
|
errmsg = "bad local file header size";
|
|
|
|
|
goto invalid_header;
|
2013-10-29 01:43:44 +01:00
|
|
|
}
|
2016-01-28 21:30:16 +02:00
|
|
|
file_offset += header_size; /* Start of file data */
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2016-01-20 22:23:44 -08:00
|
|
|
if (data_size > LONG_MAX - 1) {
|
|
|
|
|
fclose(fp);
|
|
|
|
|
PyErr_NoMemory();
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
bytes_size = compress == 0 ? data_size : data_size + 1;
|
2016-01-28 21:30:16 +02:00
|
|
|
if (bytes_size == 0) {
|
2010-05-09 15:52:27 +00:00
|
|
|
bytes_size++;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
raw_data = PyBytes_FromStringAndSize((char *)NULL, bytes_size);
|
|
|
|
|
if (raw_data == NULL) {
|
2016-01-28 21:30:16 +02:00
|
|
|
goto error;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
|
|
|
|
buf = PyBytes_AsString(raw_data);
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2016-01-28 21:30:16 +02:00
|
|
|
if (fseek(fp, file_offset, 0) == -1) {
|
|
|
|
|
goto file_error;
|
2012-10-03 02:13:05 +02:00
|
|
|
}
|
2016-01-28 21:30:16 +02:00
|
|
|
if (fread(buf, 1, data_size, fp) != (size_t)data_size) {
|
2017-04-16 10:46:38 +03:00
|
|
|
PyErr_SetString(PyExc_OSError,
|
2010-05-09 15:52:27 +00:00
|
|
|
"zipimport: can't read data");
|
2016-01-28 21:30:16 +02:00
|
|
|
goto error;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2016-01-28 21:30:16 +02:00
|
|
|
fclose(fp);
|
|
|
|
|
fp = NULL;
|
|
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
if (compress != 0) {
|
|
|
|
|
buf[data_size] = 'Z'; /* saw this in zipfile.py */
|
|
|
|
|
data_size++;
|
|
|
|
|
}
|
|
|
|
|
buf[data_size] = '\0';
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
if (compress == 0) { /* data is not compressed */
|
|
|
|
|
data = PyBytes_FromStringAndSize(buf, data_size);
|
|
|
|
|
Py_DECREF(raw_data);
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Decompress with zlib */
|
|
|
|
|
decompress = get_decompress_func();
|
|
|
|
|
if (decompress == NULL) {
|
|
|
|
|
PyErr_SetString(ZipImportError,
|
|
|
|
|
"can't decompress data; "
|
|
|
|
|
"zlib not available");
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
data = PyObject_CallFunction(decompress, "Oi", raw_data, -15);
|
2011-05-20 00:16:09 +02:00
|
|
|
Py_DECREF(decompress);
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_DECREF(raw_data);
|
2017-09-29 21:34:31 +03:00
|
|
|
if (data != NULL && !PyBytes_Check(data)) {
|
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
|
"zlib.decompress() must return a bytes object, not "
|
|
|
|
|
"%.200s",
|
|
|
|
|
Py_TYPE(data)->tp_name);
|
|
|
|
|
Py_DECREF(data);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
return data;
|
2016-01-28 21:30:16 +02:00
|
|
|
|
|
|
|
|
eof_error:
|
|
|
|
|
set_file_error(archive, !ferror(fp));
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
file_error:
|
|
|
|
|
PyErr_Format(ZipImportError, "can't read Zip file: %R", archive);
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
invalid_header:
|
|
|
|
|
assert(errmsg != NULL);
|
|
|
|
|
PyErr_Format(ZipImportError, "%s: %R", errmsg, archive);
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
error:
|
|
|
|
|
if (fp != NULL) {
|
|
|
|
|
fclose(fp);
|
|
|
|
|
}
|
|
|
|
|
Py_XDECREF(raw_data);
|
|
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Lenient date/time comparison function. The precision of the mtime
|
|
|
|
|
in the archive is lower than the mtime stored in a .pyc: we
|
|
|
|
|
must allow a difference of at most one second. */
|
|
|
|
|
static int
|
|
|
|
|
eq_mtime(time_t t1, time_t t2)
|
|
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
time_t d = t1 - t2;
|
|
|
|
|
if (d < 0)
|
|
|
|
|
d = -d;
|
|
|
|
|
/* dostime only stores even seconds, so be lenient */
|
|
|
|
|
return d <= 1;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2017-03-11 13:02:52 +08:00
|
|
|
/* Given the contents of a .pyc file in a buffer, unmarshal the data
|
2002-12-30 22:08:05 +00:00
|
|
|
and return the code object. Return None if it the magic word doesn't
|
|
|
|
|
match (we do this instead of raising an exception as we fall back
|
|
|
|
|
to .py if available and we don't want to mask other errors).
|
|
|
|
|
Returns a new reference. */
|
|
|
|
|
static PyObject *
|
2011-03-14 20:46:50 -04:00
|
|
|
unmarshal_code(PyObject *pathname, PyObject *data, time_t mtime)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
PyObject *code;
|
2016-01-28 21:30:16 +02:00
|
|
|
unsigned char *buf = (unsigned char *)PyBytes_AsString(data);
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_ssize_t size = PyBytes_Size(data);
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2017-12-09 10:26:52 -08:00
|
|
|
if (size < 16) {
|
2010-05-09 15:52:27 +00:00
|
|
|
PyErr_SetString(ZipImportError,
|
|
|
|
|
"bad pyc data");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2016-01-28 21:30:16 +02:00
|
|
|
if (get_uint32(buf) != (unsigned int)PyImport_GetMagicNumber()) {
|
|
|
|
|
if (Py_VerboseFlag) {
|
2011-03-14 20:46:50 -04:00
|
|
|
PySys_FormatStderr("# %R has bad magic\n",
|
|
|
|
|
pathname);
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2017-01-23 09:47:21 +02:00
|
|
|
Py_RETURN_NONE; /* signal caller to try alternative */
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2017-12-09 10:26:52 -08:00
|
|
|
uint32_t flags = get_uint32(buf + 4);
|
|
|
|
|
if (flags != 0) {
|
|
|
|
|
// Hash-based pyc. We currently refuse to handle checked hash-based
|
|
|
|
|
// pycs. We could validate hash-based pycs against the source, but it
|
|
|
|
|
// seems likely that most people putting hash-based pycs in a zipfile
|
|
|
|
|
// will use unchecked ones.
|
|
|
|
|
if (strcmp(_Py_CheckHashBasedPycsMode, "never") &&
|
|
|
|
|
(flags != 0x1 || !strcmp(_Py_CheckHashBasedPycsMode, "always")))
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
} else if ((mtime != 0 && !eq_mtime(get_uint32(buf + 8), mtime))) {
|
2016-01-28 21:30:16 +02:00
|
|
|
if (Py_VerboseFlag) {
|
2011-03-14 20:46:50 -04:00
|
|
|
PySys_FormatStderr("# %R has bad mtime\n",
|
|
|
|
|
pathname);
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2017-01-23 09:47:21 +02:00
|
|
|
Py_RETURN_NONE; /* signal caller to try alternative */
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2012-01-13 18:52:16 +01:00
|
|
|
/* XXX the pyc's size field is ignored; timestamp collisions are probably
|
|
|
|
|
unimportant with zip files. */
|
2017-12-09 10:26:52 -08:00
|
|
|
code = PyMarshal_ReadObjectFromString((char *)buf + 16, size - 16);
|
2016-01-28 21:30:16 +02:00
|
|
|
if (code == NULL) {
|
2010-05-09 15:52:27 +00:00
|
|
|
return NULL;
|
2016-01-28 21:30:16 +02:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
if (!PyCode_Check(code)) {
|
|
|
|
|
Py_DECREF(code);
|
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
2011-03-14 20:46:50 -04:00
|
|
|
"compiled module %R is not a code object",
|
2010-05-09 15:52:27 +00:00
|
|
|
pathname);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return code;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2016-09-07 12:03:06 +00:00
|
|
|
/* Replace any occurrences of "\r\n?" in the input string with "\n".
|
2002-12-30 22:08:05 +00:00
|
|
|
This converts DOS and Mac line endings to Unix line endings.
|
|
|
|
|
Also append a trailing "\n" to be compatible with
|
|
|
|
|
PyParser_SimpleParseFile(). Returns a new reference. */
|
|
|
|
|
static PyObject *
|
|
|
|
|
normalize_line_endings(PyObject *source)
|
|
|
|
|
{
|
2011-03-14 20:46:50 -04:00
|
|
|
char *buf, *q, *p;
|
2010-05-09 15:52:27 +00:00
|
|
|
PyObject *fixed_source;
|
|
|
|
|
int len = 0;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
p = PyBytes_AsString(source);
|
|
|
|
|
if (p == NULL) {
|
2010-05-09 15:52:27 +00:00
|
|
|
return PyBytes_FromStringAndSize("\n\0", 2);
|
|
|
|
|
}
|
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
which unfortunately means the errors from the bytes type change somewhat:
bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a
TypeError (either that, or bytes(1.0) also raises a ValueError --
PyNumber_AsSsize_t() can only raise one type of exception.)
Merged revisions 51188-51433 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines
Retrieval of previous shell command was not always preserving indentation
since 1.2a1) Patch 1528468 Tal Einat.
........
r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines
Chris McDonough's patch to defend against certain DoS attacks on FieldStorage.
SF bug #1112549.
........
r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines
News item for SF bug 1112549.
........
r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines
Fix title -- it's rc1, not beta3.
........
r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines
Update dangling references to the 3.2 database to
mention that this is UCD 4.1 now.
........
r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines
Followup to bug #1069160.
PyThreadState_SetAsyncExc(): internal correctness changes wrt
refcount safety and deadlock avoidance. Also added a basic test
case (relying on ctypes) and repaired the docs.
........
r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines
Whitespace normalization.
........
r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines
Whitespace normalization broke test_cgi, because a line
of quoted test data relied on preserving a single trailing
blank. Changed the string from raw to regular, and forced
in the trailing blank via an explicit \x20 escape.
........
r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines
test_PyThreadState_SetAsyncExc(): This is failing on some
64-bit boxes. I have no idea what the ctypes docs mean
by "integers", and blind-guessing here that it intended to
mean the signed C "int" type, in which case perhaps I can
repair this by feeding the thread id argument to type
ctypes.c_long().
Also made the worker thread daemonic, so it doesn't hang
Python shutdown if the test continues to fail.
........
r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines
force_test_exit(): This has been completely ineffective
at stopping test_signal from hanging forever on the Tru64
buildbot. That could be because there's no such thing as
signal.SIGALARM. Changed to the idiotic (but standard)
signal.SIGALRM instead, and added some more debug output.
........
r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines
Fix the failures on cygwin (2006-08-10 fixed the actual locking issue).
The first hunk changes the colon to an ! like other Windows variants.
We need to always wait on the child so the lock gets released and
no other tests fail. This is the try/finally in the second hunk.
........
r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines
Add Chris McDonough (latest cgi.py patch)
........
r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines
logging's atexit hook now runs even if the rest of the module has
already been cleaned up.
........
r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines
Add ignore of *.pyc and *.pyo to Lib/xml/etree/.
........
r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines
When a ctypes C callback function is called, zero out the result
storage before converting the result to C data. See the comment in
the code for details.
Provide a better context for errors when the conversion of a callback
function's result cannot be converted.
........
r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines
Klocwork made another run and found a bunch more problems.
This is the first batch of fixes that should be easy to verify based on context.
This fixes problem numbers: 220 (ast), 323-324 (symtable),
321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree).
........
r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines
Even though _Py_Mangle() isn't truly public anyone can call it and
there was no verification that privateobj was a PyString. If it wasn't
a string, this could have allowed a NULL pointer to creep in below and crash.
I wonder if this should be PyString_CheckExact? Must identifiers be strings
or can they be subclasses?
Klocwork #275
........
r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines
It's highly unlikely, though possible for PyEval_Get*() to return NULLs.
So be safe and do an XINCREF.
Klocwork # 221-222.
........
r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines
This code is actually not used unless WITHOUT_COMPLEX is defined.
However, there was no error checking that PyFloat_FromDouble returned
a valid pointer. I believe this change is correct as it seemed
to follow other code in the area.
Klocwork # 292.
........
r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines
Handle NULL nodes while parsing. I'm not entirely sure this is correct.
There might be something else that needs to be done to setup the error.
Klocwork #295.
........
r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines
If _stat_float_times is false, we will try to INCREF ival which could be NULL.
Return early in that case. The caller checks for PyErr_Occurred so this
should be ok.
Klocwork #297
........
r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines
Move the assert which checks for a NULL pointer first.
Klocwork #274.
........
r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines
Try to handle a malloc failure. I'm not entirely sure this is correct.
There might be something else we need to do to handle the exception.
Klocwork # 212-213
........
r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines
I'm not sure why this code allocates this string for the error message.
I think it would be better to always use snprintf and have the format
limit the size of the name appropriately (like %.200s).
Klocwork #340
........
r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines
Check returned pointer is valid.
Klocwork #233
........
r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line
Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed
........
r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines
Don't deref v if it's NULL.
Klocwork #214
........
r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines
Check return of PyMem_MALLOC (garbage) is non-NULL.
Check seq in both portions of if/else.
Klocwork #289-290.
........
r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines
PyModule_GetDict() can fail, produce fatal errors if this happens on startup.
Klocwork #298-299.
........
r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines
Verify verdat which is returned from malloc is not NULL.
Ensure we don't pass NULL to free.
Klocwork #306 (at least the first part, checking malloc)
........
r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines
test_signal: Signal handling on the Tru64 buildbot
appears to be utterly insane. Plug some theoretical
insecurities in the test script:
- Verify that the SIGALRM handler was actually installed.
- Don't call alarm() before the handler is installed.
- Move everything that can fail inside the try/finally,
so the test cleans up after itself more often.
- Try sending all the expected signals in
force_test_exit(), not just SIGALRM. Since that was
fixed to actually send SIGALRM (instead of invisibly
dying with an AttributeError), we've seen that sending
SIGALRM alone does not stop this from hanging.
- Move the "kill the child" business into the finally
clause, so the child doesn't survive test failure
to send SIGALRM to other tests later (there are also
baffling SIGALRM-related failures in test_socket).
- Cancel the alarm in the finally clause -- if the
test dies early, we again don't want SIGALRM showing
up to confuse a later test.
Alas, this still relies on timing luck wrt the spawned
script that sends the test signals, but it's hard to see
how waiting for seconds can so often be so unlucky.
test_threadedsignals: curiously, this test never fails
on Tru64, but doesn't normally signal SIGALRM. Anyway,
fixed an obvious (but probably inconsequential) logic
error.
........
r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines
Ah, fudge. One of the prints here actually "shouldn't be"
protected by "if verbose:", which caused the test to fail on
all non-Windows boxes.
Note that I deliberately didn't convert this to unittest yet,
because I expect it would be even harder to debug this on Tru64
after conversion.
........
r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines
Repair logging test spew caused by rev. 51206.
........
r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines
Patch #1538606, Patch to fix __index__() clipping.
I modified this patch some by fixing style, some error checking, and adding
XXX comments. This patch requires review and some changes are to be expected.
I'm checking in now to get the greatest possible review and establish a
baseline for moving forward. I don't want this to hold up release if possible.
........
r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines
Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots
were failing due to inappropriate clipping of numbers larger than 2**31
with new-style classes. (typeobject.c) In reviewing the code for classic
classes, there were 2 problems. Any negative value return could be returned.
Always return -1 if there was an error. Also make the checks similar
with the new-style classes. I believe this is correct for 32 and 64 bit
boxes, including Windows64.
Add a test of classic classes too.
........
r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line
SF bug #1539336, distutils example code missing
........
r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines
Move/copy assert for tstate != NULL before first use.
Verify that PyEval_Get{Globals,Locals} returned valid pointers.
Klocwork 231-232
........
r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle a whole lot of failures from PyString_FromInternedString().
Should fix most of Klocwork 234-272.
........
r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines
cpathname could be NULL if it was longer than MAXPATHLEN. Don't try
to write the .pyc to NULL.
Check results of PyList_GetItem() and PyModule_GetDict() are not NULL.
Klocwork 282, 283, 285
........
r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines
Fix segfault when doing string formatting on subclasses of long if
__oct__, __hex__ don't return a string.
Klocwork 308
........
r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines
Check return result of PyModule_GetDict().
Fix a bunch of refleaks in the init of the module. This would only be found
when running python -v.
........
r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle malloc and fopen failures more gracefully.
Klocwork 180-181
........
r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines
It's very unlikely, though possible that source is not a string. Verify
that PyString_AsString() returns a valid pointer. (The problem can
arise when zlib.decompress doesn't return a string.)
Klocwork 346
........
r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle failures from lookup.
Klocwork 341-342
........
r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines
Handle failure from PyModule_GetDict() (Klocwork 208).
Fix a bunch of refleaks in the init of the module. This would only be found
when running python -v.
........
r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines
Really address the issue of where to place the assert for leftblock.
(Followup of Klocwork 274)
........
r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines
Handle malloc failure.
Klocwork 281
........
r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines
Handle alloca failures.
Klocwork 225-228
........
r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line
Get rid of compiler warning
........
r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line
Ignore pgen.exe and kill_python.exe for cygwin
........
r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines
Can't return NULL from a void function. If there is a memory error,
about the best we can do is call PyErr_WriteUnraisable and go on.
We won't be able to do the call below either, so verify delstr is valid.
........
r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line
Update purify doc some.
........
r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines
Remove unused, buggy test function.
Fixes klockwork issue #207.
........
r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines
Check for NULL return value from new_CArgObject().
Fixes klockwork issues #183, #184, #185.
........
r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines
Check for NULL return value of GenericCData_new().
Fixes klockwork issues #188, #189.
........
r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines
Revert the change that tries to zero out a closure's result storage
area because the size if unknown in source/callproc.c.
........
r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines
Slightly revised version of patch #1538956:
Replace UnicodeDecodeErrors raised during == and !=
compares of Unicode and other objects with a new
UnicodeWarning.
All other comparisons continue to raise exceptions.
Exceptions other than UnicodeDecodeErrors are also left
untouched.
........
r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines
Apply the patch #1532975 plus ideas from the patch #1533481.
ctypes instances no longer have the internal and undocumented
'_as_parameter_' attribute which was used to adapt them to foreign
function calls; this mechanism is replaced by a function pointer in
the type's stgdict.
In the 'from_param' class methods, try the _as_parameter_ attribute if
other conversions are not possible.
This makes the documented _as_parameter_ mechanism work as intended.
Change the ctypes version number to 1.0.1.
........
r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines
Readd NEWS items that were accidentally removed by r51276.
........
r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines
Improve markup in PyUnicode_RichCompare.
........
r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines
Correct an accidentally removed previous patch.
........
r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1536908: Add support for AMD64 / OpenBSD.
Remove the -no-stack-protector compiler flag for OpenBSD
as it has been reported to be unneeded.
........
r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line
News item for rev 51281.
........
r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines
Fix refleak introduced in rev. 51248.
........
r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines
Make tabnanny recognize IndentationErrors raised by tokenize.
Add a test to test_inspect to make sure indented source
is recognized correctly. (fixes #1224621)
........
r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1535500: fix segfault in BZ2File.writelines and make sure it
raises the correct exceptions.
........
r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines
Add an additional test: BZ2File write methods should raise IOError
when file is read-only.
........
r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1536071: trace.py should now find the full module name of a
file correctly even on Windows.
........
r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines
Cookie.py shouldn't "bogusly" use string._idmap.
........
r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines
Patch #1511317: don't crash on invalid hostname info
........
r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines
Whitespace normalization.
........
r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines
Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries.
Now we're even. :-)
........
r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines
Fix the test for SocketServer so it should pass on cygwin and not fail
sporadically on other platforms. This is really a band-aid that doesn't
fix the underlying issue in SocketServer. It's not clear if it's worth
it to fix SocketServer, however, I opened a bug to track it:
http://python.org/sf/1540386
........
r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines
Update the docstring to use a version a little newer than 1999. This was
taken from a Debian patch. Should we update the version for each release?
........
r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines
Subclasses of int/long are allowed to define an __index__.
........
r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line
Check for NULL return value from new_CArgObject calls.
........
r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines
The 'with' statement is now a Code Context block opener
........
r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line
preparing for 2.5c1
........
r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line
preparing for 2.5c1 - no, really this time
........
r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines
Patch #1540892: site.py Quitter() class attempts to close sys.stdin
before raising SystemExit, allowing IDLE to honor quit() and exit().
M Lib/site.py
M Lib/idlelib/PyShell.py
M Lib/idlelib/CREDITS.txt
M Lib/idlelib/NEWS.txt
M Misc/NEWS
........
r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines
Update code and tests to support the 'bytes_le' attribute (for
little-endian byte order on Windows), and to work around clocks
with low resolution yielding duplicate UUIDs.
Anthony Baxter has approved this change.
........
r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines
Get quit() and exit() to work cleanly when not using subprocess.
........
r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines
Revert to having static version numbers again.
........
r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines
Build _hashlib on Windows. Build OpenSSL with masm assembler code.
Fixes #1535502.
........
r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines
Add commented assert statements to check that the result of
PyObject_stgdict() and PyType_stgdict() calls are non-NULL before
dereferencing the result. Hopefully this fixes what klocwork is
complaining about.
Fix a few other nits as well.
........
r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line
news entry for 51307
........
r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line
Add UnicodeWarning
........
r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line
Bump document version to 1.0; remove pystone paragraph
........
r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line
Link to docs; remove an XXX comment
........
r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line
Make cl build step compile-only (/c). Remove libs from source list.
........
r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines
The __repr__ method of a NULL py_object does no longer raise an
exception. Remove a stray '?' character from the exception text
when the value is retrieved of such an object.
Includes tests.
........
r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line
Update bug/patch counts
........
r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line
Wording/typo fixes
........
r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines
Remove the special casing of Py_None when converting the return value
of the Python part of a callback function to C. If it cannot be
converted, call PyErr_WriteUnraisable with the exception we got.
Before, arbitrary data has been passed to the calling C code in this
case.
(I'm not really sure the NEWS entry is understandable, but I cannot
find better words)
........
r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines
Add NEWS item mentioning the reverted distutils version number patch.
........
r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines
SF#1534630
ignore data that arrives before the opening start tag
........
r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line
Grammar fix
........
r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines
Tutorial:
Clarify somewhat how parameters are passed to functions
(especially explain what integer means).
Correct the table - Python integers and longs can both be used.
Further clarification to the table comparing ctypes types, Python
types, and C types.
Reference:
Replace integer by C ``int`` where it makes sense.
........
r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines
File menu hotkeys: there were three 'p' assignments. Reassign the
'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the
Shell menu hotkey from 's' to 'l'.
M Bindings.py
M PyShell.py
M NEWS.txt
........
r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines
Fix a bug in the ``compiler`` package that caused invalid code to be
generated for generator expressions.
........
r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines
Merge 51340 and 51341 from 2.5 branch:
Leave tk build directory to restore original path.
Invoke debug mk1mf.pl after running Configure.
........
r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines
Bug #1541863: uuid.uuid1 failed to generate unique identifiers
on systems with low clock resolution.
........
r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line
Add template for 2.6 on HEAD
........
r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line
More post-release wibble
........
r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Windows bots working again
........
r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Windows bots working again. Take 2
........
r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Unix bots install working again.
........
r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line
Set version to 2.6a0, seems more consistent.
........
r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line
More version wibble
........
r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines
Bug #1541682: Fix example in the "Refcount details" API docs.
Additionally, remove a faulty example showing PySequence_SetItem applied
to a newly created list object and add notes that this isn't a good idea.
........
r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines
Updating IDLE's version number to match Python's (as per python-dev
discussion).
........
r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line
RPM specfile updates
........
r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines
Typo in tp_clear docs.
........
r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line
Minor edits
........
r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines
Add asserts to check for 'impossible' NULL values, with comments.
In one place where I'n not 1000% sure about the non-NULL, raise
a RuntimeError for safety.
This should fix the klocwork issues that Neal sent me. If so,
it should be applied to the release25-maint branch also.
........
r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines
Move initialization of interned strings to before allocating the
object so we don't leak op. (Fixes an earlier patch to this code)
Klockwork #350
........
r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines
Move assert to after NULL check, otherwise we deref NULL in the assert.
Klocwork #307
........
r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines
SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro
........
r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines
Move initialization to after the asserts for non-NULL values.
Klocwork 286-287.
(I'm not backporting this, but if someone wants to, feel free.)
........
r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines
Handle PyString_FromInternedString() failing (unlikely, but possible).
Klocwork #325
(I'm not backporting this, but if someone wants to, feel free.)
........
r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines
Patch #1542948: fix urllib2 header casing issue. With new test.
........
r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines
Move peephole optimizer to separate file.
........
r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines
Move peephole optimizer to separate file. (Forgot .h in previous checkin.)
........
r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines
Fix bug #1543303, tarfile adds padding that breaks gunzip.
Patch # 1543897.
Will backport to 2.5
........
r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines
Add assert to make Klocwork happy (#276)
........
2006-08-21 19:07:27 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
/* one char extra for trailing \n and one for terminating \0 */
|
|
|
|
|
buf = (char *)PyMem_Malloc(PyBytes_Size(source) + 2);
|
|
|
|
|
if (buf == NULL) {
|
|
|
|
|
PyErr_SetString(PyExc_MemoryError,
|
|
|
|
|
"zipimport: no memory to allocate "
|
|
|
|
|
"source buffer");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
/* replace "\r\n?" by "\n" */
|
|
|
|
|
for (q = buf; *p != '\0'; p++) {
|
|
|
|
|
if (*p == '\r') {
|
|
|
|
|
*q++ = '\n';
|
|
|
|
|
if (*(p + 1) == '\n')
|
|
|
|
|
p++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
*q++ = *p;
|
|
|
|
|
len++;
|
|
|
|
|
}
|
|
|
|
|
*q++ = '\n'; /* add trailing \n */
|
|
|
|
|
*q = '\0';
|
|
|
|
|
fixed_source = PyBytes_FromStringAndSize(buf, len + 2);
|
|
|
|
|
PyMem_Free(buf);
|
|
|
|
|
return fixed_source;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given a string buffer containing Python source code, compile it
|
2013-06-20 21:30:32 -04:00
|
|
|
and return a code object as a new reference. */
|
2002-12-30 22:08:05 +00:00
|
|
|
static PyObject *
|
2011-03-14 20:46:50 -04:00
|
|
|
compile_source(PyObject *pathname, PyObject *source)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2016-09-09 17:27:33 -07:00
|
|
|
PyObject *code, *fixed_source;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
fixed_source = normalize_line_endings(source);
|
|
|
|
|
if (fixed_source == NULL) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-09 17:27:33 -07:00
|
|
|
code = Py_CompileStringObject(PyBytes_AsString(fixed_source),
|
2016-09-14 08:09:48 +03:00
|
|
|
pathname, Py_file_input, NULL, -1);
|
2016-09-09 17:27:33 -07:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_DECREF(fixed_source);
|
|
|
|
|
return code;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert the date/time values found in the Zip archive to a value
|
|
|
|
|
that's compatible with the time stamp stored in .pyc files. */
|
2003-03-23 13:21:03 +00:00
|
|
|
static time_t
|
|
|
|
|
parse_dostime(int dostime, int dosdate)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
struct tm stm;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
memset((void *) &stm, '\0', sizeof(stm));
|
Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59987 | raymond.hettinger | 2008-01-15 21:52:42 +0100 (Tue, 15 Jan 2008) | 1 line
Refactor if/elif chain for clarity and speed. Remove dependency on subclasses having to implement _empty and _full.
........
r59988 | raymond.hettinger | 2008-01-15 22:22:47 +0100 (Tue, 15 Jan 2008) | 1 line
Fix-up half-written paragraph in the docs
........
r59989 | amaury.forgeotdarc | 2008-01-15 22:25:11 +0100 (Tue, 15 Jan 2008) | 3 lines
test_doctest fails since r59984.
Not sure if these are the correct values, but save_stdout has to be set before its usage...
........
r59992 | andrew.kuchling | 2008-01-16 01:32:03 +0100 (Wed, 16 Jan 2008) | 1 line
Docstring typos
........
r59993 | andrew.kuchling | 2008-01-16 04:17:25 +0100 (Wed, 16 Jan 2008) | 1 line
Add PEP 3141 section
........
r59998 | andrew.kuchling | 2008-01-16 14:01:51 +0100 (Wed, 16 Jan 2008) | 1 line
Markup fix
........
r59999 | georg.brandl | 2008-01-16 17:56:29 +0100 (Wed, 16 Jan 2008) | 2 lines
Fix MSDN library URL. (#1854)
........
r60006 | georg.brandl | 2008-01-16 21:27:56 +0100 (Wed, 16 Jan 2008) | 3 lines
Add Python-specific content to Doc dir. Update configuration file
to work with the newest Sphinx.
........
r60007 | georg.brandl | 2008-01-16 21:29:00 +0100 (Wed, 16 Jan 2008) | 2 lines
Doc build should work with 2.4 now.
........
r60009 | raymond.hettinger | 2008-01-17 00:38:16 +0100 (Thu, 17 Jan 2008) | 1 line
Minor wordsmithing.
........
r60010 | raymond.hettinger | 2008-01-17 00:40:45 +0100 (Thu, 17 Jan 2008) | 1 line
Add queues will alternative fetch orders (priority based and stack based).
........
r60011 | raymond.hettinger | 2008-01-17 00:49:35 +0100 (Thu, 17 Jan 2008) | 1 line
Add news entry.
........
r60013 | raymond.hettinger | 2008-01-17 04:02:14 +0100 (Thu, 17 Jan 2008) | 1 line
Make starmap() match its pure python definition and accept any itertable input (not just tuples).
........
r60015 | gregory.p.smith | 2008-01-17 08:43:20 +0100 (Thu, 17 Jan 2008) | 3 lines
Comply with RFC 3207.
Fixes issue 829951 - http://bugs.python.org/issue829951
........
r60018 | gregory.p.smith | 2008-01-17 09:03:17 +0100 (Thu, 17 Jan 2008) | 2 lines
entry for r60015
........
r60019 | raymond.hettinger | 2008-01-17 09:07:05 +0100 (Thu, 17 Jan 2008) | 1 line
Note versionadded.
........
r60020 | gregory.p.smith | 2008-01-17 09:35:49 +0100 (Thu, 17 Jan 2008) | 8 lines
Fixes (accepts patch) issue1339 - http://bugs.python.org/issue1339
- Factor out the duplication of EHLO/HELO in login() and sendmail() to
a new function, ehlo_or_helo_if_needed().
- Use ehlo_or_helo_if_needed() in starttls()
- Check for the starttls exception in starttls() in the same way as
login() checks for the auth extension.
Contributed by Bill Fenner.
........
r60021 | andrew.kuchling | 2008-01-17 13:00:15 +0100 (Thu, 17 Jan 2008) | 1 line
Revise 3141 section a bit; add some Windows items
........
r60022 | brett.cannon | 2008-01-17 19:45:10 +0100 (Thu, 17 Jan 2008) | 2 lines
Fix a function pointer declaration to silence the compiler.
........
r60024 | raymond.hettinger | 2008-01-17 20:31:38 +0100 (Thu, 17 Jan 2008) | 1 line
Issue #1861: Add read-only attribute listing upcoming events in the order they will be run.
........
r60025 | andrew.kuchling | 2008-01-17 20:49:24 +0100 (Thu, 17 Jan 2008) | 1 line
Correction from Jordan Lewis: halfdelay() uses tenths of a second, not milliseconds
........
r60026 | raymond.hettinger | 2008-01-17 23:27:49 +0100 (Thu, 17 Jan 2008) | 1 line
Add advice on choosing between scheduler and threading.Timer().
........
r60028 | christian.heimes | 2008-01-18 00:01:44 +0100 (Fri, 18 Jan 2008) | 2 lines
Updated new property syntax. An elaborate example for subclassing and the getter was missing.
Added comment about VS 2008 and PGO builds.
........
r60029 | raymond.hettinger | 2008-01-18 00:32:01 +0100 (Fri, 18 Jan 2008) | 1 line
Fix-up Timer() example.
........
r60030 | raymond.hettinger | 2008-01-18 00:56:56 +0100 (Fri, 18 Jan 2008) | 1 line
Fix markup
........
r60031 | raymond.hettinger | 2008-01-18 01:10:42 +0100 (Fri, 18 Jan 2008) | 1 line
clearcache() needs to remove the dict as well as clear it.
........
r60033 | andrew.kuchling | 2008-01-18 03:26:16 +0100 (Fri, 18 Jan 2008) | 1 line
Bump verson
........
r60034 | andrew.kuchling | 2008-01-18 03:42:52 +0100 (Fri, 18 Jan 2008) | 1 line
Typo fix
........
r60035 | christian.heimes | 2008-01-18 08:30:20 +0100 (Fri, 18 Jan 2008) | 3 lines
Coverity issue CID #197
var_decl: Declared variable "stm" without initializer
ninit_use_in_call: Using uninitialized value "stm" (field "stm".tm_zone uninitialized) in call to function "mktime"
........
r60036 | christian.heimes | 2008-01-18 08:45:30 +0100 (Fri, 18 Jan 2008) | 11 lines
Coverity issue CID #167
Event alloc_fn: Called allocation function "metacompile" [model]
Event var_assign: Assigned variable "gr" to storage returned from "metacompile"
gr = metacompile(n);
Event pass_arg: Variable "gr" not freed or pointed-to in function "maketables" [model]
g = maketables(gr);
translatelabels(g);
addfirstsets(g);
Event leaked_storage: Returned without freeing storage "gr"
return g;
........
r60038 | christian.heimes | 2008-01-18 09:04:57 +0100 (Fri, 18 Jan 2008) | 3 lines
Coverity issue CID #182
size_error: Allocating 1 bytes to pointer "children", which needs at least 4 bytes
........
r60041 | christian.heimes | 2008-01-18 09:47:59 +0100 (Fri, 18 Jan 2008) | 4 lines
Coverity issue CID #169
local_ptr_assign_local: Assigning address of stack variable "namebuf" to pointer "filename"
out_of_scope: Variable "namebuf" goes out of scope
use_invalid: Used "filename" pointing to out-of-scope variable "namebuf"
........
r60042 | christian.heimes | 2008-01-18 09:53:45 +0100 (Fri, 18 Jan 2008) | 2 lines
Coverity CID #168
leaked_storage: Returned without freeing storage "fp"
........
2008-01-18 09:56:22 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
stm.tm_sec = (dostime & 0x1f) * 2;
|
|
|
|
|
stm.tm_min = (dostime >> 5) & 0x3f;
|
|
|
|
|
stm.tm_hour = (dostime >> 11) & 0x1f;
|
|
|
|
|
stm.tm_mday = dosdate & 0x1f;
|
|
|
|
|
stm.tm_mon = ((dosdate >> 5) & 0x0f) - 1;
|
|
|
|
|
stm.tm_year = ((dosdate >> 9) & 0x7f) + 80;
|
|
|
|
|
stm.tm_isdst = -1; /* wday/yday is ignored */
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
return mktime(&stm);
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2015-04-13 14:21:02 -04:00
|
|
|
/* Given a path to a .pyc file in the archive, return the
|
2011-03-16 11:05:33 +02:00
|
|
|
modification time of the matching .py file, or 0 if no source
|
2002-12-30 22:08:05 +00:00
|
|
|
is available. */
|
|
|
|
|
static time_t
|
2011-03-14 20:46:50 -04:00
|
|
|
get_mtime_of_source(ZipImporter *self, PyObject *path)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2011-03-14 20:46:50 -04:00
|
|
|
PyObject *toc_entry, *stripped;
|
|
|
|
|
time_t mtime;
|
|
|
|
|
|
2017-03-11 13:02:52 +08:00
|
|
|
/* strip 'c' from *.pyc */
|
2011-09-28 07:41:54 +02:00
|
|
|
if (PyUnicode_READY(path) == -1)
|
|
|
|
|
return (time_t)-1;
|
|
|
|
|
stripped = PyUnicode_FromKindAndData(PyUnicode_KIND(path),
|
|
|
|
|
PyUnicode_DATA(path),
|
|
|
|
|
PyUnicode_GET_LENGTH(path) - 1);
|
2011-03-14 20:46:50 -04:00
|
|
|
if (stripped == NULL)
|
|
|
|
|
return (time_t)-1;
|
|
|
|
|
|
|
|
|
|
toc_entry = PyDict_GetItem(self->files, stripped);
|
|
|
|
|
Py_DECREF(stripped);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (toc_entry != NULL && PyTuple_Check(toc_entry) &&
|
|
|
|
|
PyTuple_Size(toc_entry) == 8) {
|
|
|
|
|
/* fetch the time stamp of the .py file for comparison
|
|
|
|
|
with an embedded pyc time stamp */
|
|
|
|
|
int time, date;
|
|
|
|
|
time = PyLong_AsLong(PyTuple_GetItem(toc_entry, 5));
|
|
|
|
|
date = PyLong_AsLong(PyTuple_GetItem(toc_entry, 6));
|
|
|
|
|
mtime = parse_dostime(time, date);
|
2011-03-14 20:46:50 -04:00
|
|
|
} else
|
|
|
|
|
mtime = 0;
|
2010-05-09 15:52:27 +00:00
|
|
|
return mtime;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the code object for the module named by 'fullname' from the
|
|
|
|
|
Zip archive as a new reference. */
|
|
|
|
|
static PyObject *
|
2014-02-16 14:17:28 -05:00
|
|
|
get_code_from_data(ZipImporter *self, int ispackage, int isbytecode,
|
2010-05-09 15:52:27 +00:00
|
|
|
time_t mtime, PyObject *toc_entry)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2011-03-14 20:46:50 -04:00
|
|
|
PyObject *data, *modpath, *code;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2014-02-16 14:17:28 -05:00
|
|
|
data = get_data(self->archive, toc_entry);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (data == NULL)
|
|
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
modpath = PyTuple_GetItem(toc_entry, 0);
|
2010-10-18 12:15:34 +00:00
|
|
|
if (isbytecode)
|
2011-03-14 20:46:50 -04:00
|
|
|
code = unmarshal_code(modpath, data, mtime);
|
2010-10-18 12:15:34 +00:00
|
|
|
else
|
2011-03-14 20:46:50 -04:00
|
|
|
code = compile_source(modpath, data);
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_DECREF(data);
|
|
|
|
|
return code;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
2011-03-15 05:18:48 +02:00
|
|
|
/* Get the code object associated with the module specified by
|
2002-12-30 22:08:05 +00:00
|
|
|
'fullname'. */
|
|
|
|
|
static PyObject *
|
2011-03-14 20:46:50 -04:00
|
|
|
get_module_code(ZipImporter *self, PyObject *fullname,
|
2010-10-18 12:09:02 +00:00
|
|
|
int *p_ispackage, PyObject **p_modpath)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2011-05-21 05:19:42 -07:00
|
|
|
PyObject *code = NULL, *toc_entry, *subname;
|
2011-05-26 13:59:41 +02:00
|
|
|
PyObject *path, *fullpath = NULL;
|
2010-05-09 15:52:27 +00:00
|
|
|
struct st_zip_searchorder *zso;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2017-10-20 23:42:35 +03:00
|
|
|
if (self->prefix == NULL) {
|
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
|
"zipimporter.__init__() wasn't called");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
subname = get_subname(fullname);
|
2011-03-14 20:46:50 -04:00
|
|
|
if (subname == NULL)
|
|
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
path = make_filename(self->prefix, subname);
|
|
|
|
|
Py_DECREF(subname);
|
|
|
|
|
if (path == NULL)
|
2010-05-09 15:52:27 +00:00
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
for (zso = zip_searchorder; *zso->suffix; zso++) {
|
2011-03-14 20:46:50 -04:00
|
|
|
code = NULL;
|
|
|
|
|
|
|
|
|
|
fullpath = PyUnicode_FromFormat("%U%s", path, zso->suffix);
|
|
|
|
|
if (fullpath == NULL)
|
|
|
|
|
goto exit;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
if (Py_VerboseFlag > 1)
|
2011-03-14 20:46:50 -04:00
|
|
|
PySys_FormatStderr("# trying %U%c%U\n",
|
|
|
|
|
self->archive, (int)SEP, fullpath);
|
|
|
|
|
toc_entry = PyDict_GetItem(self->files, fullpath);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (toc_entry != NULL) {
|
|
|
|
|
time_t mtime = 0;
|
|
|
|
|
int ispackage = zso->type & IS_PACKAGE;
|
|
|
|
|
int isbytecode = zso->type & IS_BYTECODE;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2011-03-14 20:46:50 -04:00
|
|
|
if (isbytecode) {
|
|
|
|
|
mtime = get_mtime_of_source(self, fullpath);
|
|
|
|
|
if (mtime == (time_t)-1 && PyErr_Occurred()) {
|
|
|
|
|
goto exit;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Py_CLEAR(fullpath);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (p_ispackage != NULL)
|
|
|
|
|
*p_ispackage = ispackage;
|
2014-02-16 14:17:28 -05:00
|
|
|
code = get_code_from_data(self, ispackage,
|
2010-05-09 15:52:27 +00:00
|
|
|
isbytecode, mtime,
|
|
|
|
|
toc_entry);
|
|
|
|
|
if (code == Py_None) {
|
|
|
|
|
/* bad magic number or non-matching mtime
|
|
|
|
|
in byte code, try next */
|
|
|
|
|
Py_DECREF(code);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2010-10-18 12:09:02 +00:00
|
|
|
if (code != NULL && p_modpath != NULL) {
|
|
|
|
|
*p_modpath = PyTuple_GetItem(toc_entry, 0);
|
|
|
|
|
Py_INCREF(*p_modpath);
|
|
|
|
|
}
|
2011-03-14 20:46:50 -04:00
|
|
|
goto exit;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2011-03-14 20:46:50 -04:00
|
|
|
else
|
|
|
|
|
Py_CLEAR(fullpath);
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2011-03-14 20:46:50 -04:00
|
|
|
PyErr_Format(ZipImportError, "can't find module %R", fullname);
|
|
|
|
|
exit:
|
|
|
|
|
Py_DECREF(path);
|
|
|
|
|
Py_XDECREF(fullpath);
|
|
|
|
|
return code;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Module init */
|
|
|
|
|
|
|
|
|
|
PyDoc_STRVAR(zipimport_doc,
|
|
|
|
|
"zipimport provides support for importing Python modules from Zip archives.\n\
|
|
|
|
|
\n\
|
|
|
|
|
This module exports three objects:\n\
|
|
|
|
|
- zipimporter: a class; its constructor takes a path to a Zip archive.\n\
|
2006-01-15 15:00:40 +00:00
|
|
|
- ZipImportError: exception raised by zipimporter objects. It's a\n\
|
2002-12-30 22:08:05 +00:00
|
|
|
subclass of ImportError, so it can be caught as ImportError, too.\n\
|
|
|
|
|
- _zip_directory_cache: a dict, mapping archive paths to zip directory\n\
|
|
|
|
|
info dicts, as used in zipimporter._files.\n\
|
|
|
|
|
\n\
|
|
|
|
|
It is usually not needed to use the zipimport module explicitly; it is\n\
|
|
|
|
|
used by the builtin import mechanism for sys.path items that are paths\n\
|
|
|
|
|
to Zip archives.");
|
|
|
|
|
|
2008-06-11 05:26:20 +00:00
|
|
|
static struct PyModuleDef zipimportmodule = {
|
2010-05-09 15:52:27 +00:00
|
|
|
PyModuleDef_HEAD_INIT,
|
|
|
|
|
"zipimport",
|
|
|
|
|
zipimport_doc,
|
|
|
|
|
-1,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL
|
2008-06-11 05:26:20 +00:00
|
|
|
};
|
|
|
|
|
|
2002-12-30 22:08:05 +00:00
|
|
|
PyMODINIT_FUNC
|
2008-06-11 05:26:20 +00:00
|
|
|
PyInit_zipimport(void)
|
2002-12-30 22:08:05 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
PyObject *mod;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
if (PyType_Ready(&ZipImporter_Type) < 0)
|
|
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
/* Correct directory separator */
|
|
|
|
|
zip_searchorder[0].suffix[0] = SEP;
|
|
|
|
|
zip_searchorder[1].suffix[0] = SEP;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
mod = PyModule_Create(&zipimportmodule);
|
|
|
|
|
if (mod == NULL)
|
|
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
ZipImportError = PyErr_NewException("zipimport.ZipImportError",
|
|
|
|
|
PyExc_ImportError, NULL);
|
|
|
|
|
if (ZipImportError == NULL)
|
|
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_INCREF(ZipImportError);
|
|
|
|
|
if (PyModule_AddObject(mod, "ZipImportError",
|
|
|
|
|
ZipImportError) < 0)
|
|
|
|
|
return NULL;
|
2002-12-30 22:08:05 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_INCREF(&ZipImporter_Type);
|
|
|
|
|
if (PyModule_AddObject(mod, "zipimporter",
|
|
|
|
|
(PyObject *)&ZipImporter_Type) < 0)
|
|
|
|
|
return NULL;
|
2002-12-31 09:51:59 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
zip_directory_cache = PyDict_New();
|
|
|
|
|
if (zip_directory_cache == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
Py_INCREF(zip_directory_cache);
|
|
|
|
|
if (PyModule_AddObject(mod, "_zip_directory_cache",
|
|
|
|
|
zip_directory_cache) < 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
return mod;
|
2002-12-30 22:08:05 +00:00
|
|
|
}
|