| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | #include "Python.h"
 | 
					
						
							|  |  |  | #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 { | 
					
						
							|  |  |  | 	char suffix[14]; | 
					
						
							|  |  |  | 	int type; | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* zip_searchorder defines how we search for a module in the Zip
 | 
					
						
							|  |  |  |    archive: we first search for a package __init__, then for | 
					
						
							|  |  |  |    non-package .pyc, .pyo and .py entries. The .pyc and .pyo entries | 
					
						
							|  |  |  |    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[] = { | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	{"/__init__.pyc", IS_PACKAGE | IS_BYTECODE}, | 
					
						
							|  |  |  | 	{"/__init__.pyo", IS_PACKAGE | IS_BYTECODE}, | 
					
						
							|  |  |  | 	{"/__init__.py", IS_PACKAGE | IS_SOURCE}, | 
					
						
							|  |  |  | 	{".pyc", IS_BYTECODE}, | 
					
						
							|  |  |  | 	{".pyo", IS_BYTECODE}, | 
					
						
							|  |  |  | 	{".py", IS_SOURCE}, | 
					
						
							|  |  |  | 	{"", 0} | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* zipimporter object definition and support */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | typedef struct _zipimporter ZipImporter; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | struct _zipimporter { | 
					
						
							|  |  |  | 	PyObject_HEAD | 
					
						
							|  |  |  | 	PyObject *archive;  /* pathname of the Zip archive */ | 
					
						
							|  |  |  | 	PyObject *prefix;   /* file prefix: "a/sub/directory/" */ | 
					
						
							|  |  |  | 	PyObject *files;    /* dict with file info {path: toc_entry} */ | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static PyObject *ZipImportError; | 
					
						
							|  |  |  | static PyObject *zip_directory_cache = NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* forward decls */ | 
					
						
							|  |  |  | static PyObject *read_directory(char *archive); | 
					
						
							|  |  |  | static PyObject *get_data(char *archive, PyObject *toc_entry); | 
					
						
							|  |  |  | static PyObject *get_module_code(ZipImporter *self, char *fullname, | 
					
						
							|  |  |  | 				 int *p_ispackage, char **p_modpath); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define ZipImporter_Check(op) PyObject_TypeCheck(op, &ZipImporter_Type)
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* 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. */ | 
					
						
							|  |  |  | static int | 
					
						
							|  |  |  | zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	char *path, *p, *prefix, buf[MAXPATHLEN+2]; | 
					
						
							| 
									
										
										
										
											2008-05-07 02:48:42 +00:00
										 |  |  | 	size_t len; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-08-26 06:42:30 +00:00
										 |  |  | 	if (!_PyArg_NoKeywords("zipimporter()", kwds)) | 
					
						
							|  |  |  | 		return -1; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-07 02:48:42 +00:00
										 |  |  | 	if (!PyArg_ParseTuple(args, "s:zipimporter", &path)) | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		return -1; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-07 02:48:42 +00:00
										 |  |  | 	len = strlen(path); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	if (len == 0) { | 
					
						
							|  |  |  | 		PyErr_SetString(ZipImportError, "archive path is empty"); | 
					
						
							|  |  |  | 		return -1; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if (len >= MAXPATHLEN) { | 
					
						
							|  |  |  | 		PyErr_SetString(ZipImportError, | 
					
						
							|  |  |  | 				"archive path too long"); | 
					
						
							|  |  |  | 		return -1; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	strcpy(buf, path); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #ifdef ALTSEP
 | 
					
						
							|  |  |  | 	for (p = buf; *p; p++) { | 
					
						
							|  |  |  | 		if (*p == ALTSEP) | 
					
						
							|  |  |  | 			*p = SEP; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	path = NULL; | 
					
						
							|  |  |  | 	prefix = NULL; | 
					
						
							|  |  |  | 	for (;;) { | 
					
						
							|  |  |  | 		struct stat statbuf; | 
					
						
							|  |  |  | 		int rv; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		rv = stat(buf, &statbuf); | 
					
						
							|  |  |  | 		if (rv == 0) { | 
					
						
							|  |  |  | 			/* it exists */ | 
					
						
							|  |  |  | 			if (S_ISREG(statbuf.st_mode)) | 
					
						
							|  |  |  | 				/* it's a file */ | 
					
						
							|  |  |  | 				path = buf; | 
					
						
							|  |  |  | 			break; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		/* back up one path element */ | 
					
						
							| 
									
										
										
										
											2003-01-02 12:55:48 +00:00
										 |  |  | 		p = strrchr(buf, SEP); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		if (prefix != NULL) | 
					
						
							|  |  |  | 			*prefix = SEP; | 
					
						
							|  |  |  | 		if (p == NULL) | 
					
						
							|  |  |  | 			break; | 
					
						
							|  |  |  | 		*p = '\0'; | 
					
						
							|  |  |  | 		prefix = p; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if (path != NULL) { | 
					
						
							|  |  |  | 		PyObject *files; | 
					
						
							|  |  |  | 		files = PyDict_GetItemString(zip_directory_cache, path); | 
					
						
							|  |  |  | 		if (files == NULL) { | 
					
						
							|  |  |  | 			files = read_directory(buf); | 
					
						
							|  |  |  | 			if (files == NULL) | 
					
						
							|  |  |  | 				return -1; | 
					
						
							|  |  |  | 			if (PyDict_SetItemString(zip_directory_cache, path, | 
					
						
							|  |  |  | 						 files) != 0) | 
					
						
							|  |  |  | 				return -1; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		else | 
					
						
							|  |  |  | 			Py_INCREF(files); | 
					
						
							|  |  |  | 		self->files = files; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	else { | 
					
						
							|  |  |  | 		PyErr_SetString(ZipImportError, "not a Zip file"); | 
					
						
							|  |  |  | 		return -1; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (prefix == NULL) | 
					
						
							|  |  |  | 		prefix = ""; | 
					
						
							|  |  |  | 	else { | 
					
						
							|  |  |  | 		prefix++; | 
					
						
							|  |  |  | 		len = strlen(prefix); | 
					
						
							|  |  |  | 		if (prefix[len-1] != SEP) { | 
					
						
							|  |  |  | 			/* add trailing SEP */ | 
					
						
							|  |  |  | 			prefix[len] = SEP; | 
					
						
							|  |  |  | 			prefix[len + 1] = '\0'; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-26 05:08:21 +00:00
										 |  |  | 	self->archive = PyUnicode_FromString(buf); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	if (self->archive == NULL) | 
					
						
							|  |  |  | 		return -1; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-26 05:08:21 +00:00
										 |  |  | 	self->prefix = PyUnicode_FromString(prefix); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	if (self->prefix == NULL) | 
					
						
							|  |  |  | 		return -1; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	return 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* GC support. */ | 
					
						
							|  |  |  | static int | 
					
						
							|  |  |  | zipimporter_traverse(PyObject *obj, visitproc visit, void *arg) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	ZipImporter *self = (ZipImporter *)obj; | 
					
						
							| 
									
										
										
										
											2006-04-21 10:40:58 +00:00
										 |  |  | 	Py_VISIT(self->files); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	return 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void | 
					
						
							|  |  |  | zipimporter_dealloc(ZipImporter *self) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	PyObject_GC_UnTrack(self); | 
					
						
							|  |  |  | 	Py_XDECREF(self->archive); | 
					
						
							| 
									
										
										
										
											2002-12-31 09:51:59 +00:00
										 |  |  | 	Py_XDECREF(self->prefix); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	Py_XDECREF(self->files); | 
					
						
							| 
									
										
										
										
											2007-12-19 02:45:37 +00:00
										 |  |  | 	Py_TYPE(self)->tp_free((PyObject *)self); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | zipimporter_repr(ZipImporter *self) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	char *archive = "???"; | 
					
						
							|  |  |  | 	char *prefix = ""; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-26 05:08:21 +00:00
										 |  |  | 	if (self->archive != NULL && PyUnicode_Check(self->archive)) | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 		archive = _PyUnicode_AsString(self->archive); | 
					
						
							| 
									
										
										
										
											2007-08-26 05:08:21 +00:00
										 |  |  | 	if (self->prefix != NULL && PyUnicode_Check(self->prefix)) | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 		prefix = _PyUnicode_AsString(self->prefix); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	if (prefix != NULL && *prefix) | 
					
						
							| 
									
										
										
										
											2007-06-05 16:19:33 +00:00
										 |  |  | 		return PyUnicode_FromFormat("<zipimporter object \"%.300s%c%.150s\">", | 
					
						
							|  |  |  | 		                            archive, SEP, prefix); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	else | 
					
						
							| 
									
										
										
										
											2007-06-05 16:19:33 +00:00
										 |  |  | 		return PyUnicode_FromFormat("<zipimporter object \"%.300s\">", | 
					
						
							|  |  |  | 		                            archive); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* return fullname.split(".")[-1] */ | 
					
						
							|  |  |  | static char * | 
					
						
							|  |  |  | get_subname(char *fullname) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	char *subname = strrchr(fullname, '.'); | 
					
						
							|  |  |  | 	if (subname == NULL) | 
					
						
							|  |  |  | 		subname = fullname; | 
					
						
							|  |  |  | 	else | 
					
						
							|  |  |  | 		subname++; | 
					
						
							|  |  |  | 	return subname; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Given a (sub)modulename, write the potential file path in the
 | 
					
						
							|  |  |  |    archive (without extension) to the path buffer. Return the | 
					
						
							|  |  |  |    length of the resulting string. */ | 
					
						
							|  |  |  | static int | 
					
						
							|  |  |  | make_filename(char *prefix, char *name, char *path) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2006-01-08 01:03:36 +00:00
										 |  |  | 	size_t len; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	char *p; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	len = strlen(prefix); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	/* self.prefix + name [+ SEP + "__init__"] + ".py[co]" */ | 
					
						
							|  |  |  | 	if (len + strlen(name) + 13 >= MAXPATHLEN) { | 
					
						
							|  |  |  | 		PyErr_SetString(ZipImportError, "path too long"); | 
					
						
							|  |  |  | 		return -1; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	strcpy(path, prefix); | 
					
						
							|  |  |  | 	strcpy(path + len, name); | 
					
						
							|  |  |  | 	for (p = path + len; *p; p++) { | 
					
						
							|  |  |  | 		if (*p == '.') | 
					
						
							|  |  |  | 			*p = SEP; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	len += strlen(name); | 
					
						
							| 
									
										
										
										
											2006-02-15 17:27:45 +00:00
										 |  |  | 	assert(len < INT_MAX); | 
					
						
							| 
									
										
										
										
											2006-01-08 01:03:36 +00:00
										 |  |  | 	return (int)len; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2004-11-10 13:08:35 +00:00
										 |  |  | enum zi_module_info { | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	MI_ERROR, | 
					
						
							|  |  |  | 	MI_NOT_FOUND, | 
					
						
							|  |  |  | 	MI_MODULE, | 
					
						
							|  |  |  | 	MI_PACKAGE | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Return some information about a module. */ | 
					
						
							| 
									
										
										
										
											2004-11-10 13:08:35 +00:00
										 |  |  | static enum zi_module_info | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | get_module_info(ZipImporter *self, char *fullname) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	char *subname, path[MAXPATHLEN + 1]; | 
					
						
							|  |  |  | 	int len; | 
					
						
							|  |  |  | 	struct st_zip_searchorder *zso; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	subname = get_subname(fullname); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 	len = make_filename(_PyUnicode_AsString(self->prefix), subname, path); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	if (len < 0) | 
					
						
							|  |  |  | 		return MI_ERROR; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	for (zso = zip_searchorder; *zso->suffix; zso++) { | 
					
						
							|  |  |  | 		strcpy(path + len, zso->suffix); | 
					
						
							|  |  |  | 		if (PyDict_GetItemString(self->files, path) != NULL) { | 
					
						
							|  |  |  | 			if (zso->type & IS_PACKAGE) | 
					
						
							|  |  |  | 				return MI_PACKAGE; | 
					
						
							|  |  |  | 			else | 
					
						
							|  |  |  | 				return MI_MODULE; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return MI_NOT_FOUND; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Check whether we can satisfy the import of the module named by
 | 
					
						
							|  |  |  |    'fullname'. Return self if we can, None if we can't. */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | zipimporter_find_module(PyObject *obj, PyObject *args) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	ZipImporter *self = (ZipImporter *)obj; | 
					
						
							|  |  |  | 	PyObject *path = NULL; | 
					
						
							|  |  |  | 	char *fullname; | 
					
						
							| 
									
										
										
										
											2004-11-10 13:08:35 +00:00
										 |  |  | 	enum zi_module_info mi; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (!PyArg_ParseTuple(args, "s|O:zipimporter.find_module", | 
					
						
							|  |  |  | 			      &fullname, &path)) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	mi = get_module_info(self, fullname); | 
					
						
							|  |  |  | 	if (mi == MI_ERROR) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	if (mi == MI_NOT_FOUND) { | 
					
						
							|  |  |  | 		Py_INCREF(Py_None); | 
					
						
							|  |  |  | 		return Py_None; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	Py_INCREF(self); | 
					
						
							|  |  |  | 	return (PyObject *)self; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Load and return the module named by 'fullname'. */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | zipimporter_load_module(PyObject *obj, PyObject *args) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	ZipImporter *self = (ZipImporter *)obj; | 
					
						
							|  |  |  | 	PyObject *code, *mod, *dict; | 
					
						
							|  |  |  | 	char *fullname, *modpath; | 
					
						
							|  |  |  | 	int ispackage; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (!PyArg_ParseTuple(args, "s:zipimporter.load_module", | 
					
						
							|  |  |  | 			      &fullname)) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	code = get_module_code(self, fullname, &ispackage, &modpath); | 
					
						
							|  |  |  | 	if (code == NULL) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	mod = PyImport_AddModule(fullname); | 
					
						
							|  |  |  | 	if (mod == NULL) { | 
					
						
							|  |  |  | 		Py_DECREF(code); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	dict = PyModule_GetDict(mod); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	/* mod.__loader__ = self */ | 
					
						
							|  |  |  | 	if (PyDict_SetItemString(dict, "__loader__", (PyObject *)self) != 0) | 
					
						
							|  |  |  | 		goto error; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (ispackage) { | 
					
						
							|  |  |  | 		/* add __path__ to the module *before* the code gets
 | 
					
						
							|  |  |  | 		   executed */ | 
					
						
							|  |  |  | 		PyObject *pkgpath, *fullpath; | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 		char *prefix = _PyUnicode_AsString(self->prefix); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		char *subname = get_subname(fullname); | 
					
						
							|  |  |  | 		int err; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-26 05:08:21 +00:00
										 |  |  | 		fullpath = PyUnicode_FromFormat("%s%c%s%s", | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 					_PyUnicode_AsString(self->archive), | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 					SEP, | 
					
						
							| 
									
										
										
										
											2008-05-03 18:24:43 +00:00
										 |  |  | 					prefix ? prefix : "", | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 					subname); | 
					
						
							|  |  |  | 		if (fullpath == NULL) | 
					
						
							|  |  |  | 			goto error; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		pkgpath = Py_BuildValue("[O]", fullpath); | 
					
						
							|  |  |  | 		Py_DECREF(fullpath); | 
					
						
							|  |  |  | 		if (pkgpath == NULL) | 
					
						
							|  |  |  | 			goto error; | 
					
						
							|  |  |  | 		err = PyDict_SetItemString(dict, "__path__", pkgpath); | 
					
						
							|  |  |  | 		Py_DECREF(pkgpath); | 
					
						
							|  |  |  | 		if (err != 0) | 
					
						
							|  |  |  | 			goto error; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	mod = PyImport_ExecCodeModuleEx(fullname, code, modpath); | 
					
						
							|  |  |  | 	Py_DECREF(code); | 
					
						
							|  |  |  | 	if (Py_VerboseFlag) | 
					
						
							|  |  |  | 		PySys_WriteStderr("import %s # loaded from Zip %s\n", | 
					
						
							|  |  |  | 				  fullname, modpath); | 
					
						
							|  |  |  | 	return mod; | 
					
						
							|  |  |  | error: | 
					
						
							|  |  |  | 	Py_DECREF(code); | 
					
						
							|  |  |  | 	Py_DECREF(mod); | 
					
						
							|  |  |  | 	return NULL; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-14 11:50:48 +00:00
										 |  |  | /* Return a string matching __file__ for the named module */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | zipimporter_get_filename(PyObject *obj, PyObject *args) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ZipImporter *self = (ZipImporter *)obj; | 
					
						
							|  |  |  |     PyObject *code; | 
					
						
							|  |  |  |     char *fullname, *modpath; | 
					
						
							|  |  |  |     int ispackage; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-02-08 03:37:27 +00:00
										 |  |  |     if (!PyArg_ParseTuple(args, "s:zipimporter.get_filename", | 
					
						
							| 
									
										
										
										
											2008-12-14 11:50:48 +00:00
										 |  |  |                          &fullname)) | 
					
						
							|  |  |  |         return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     /* 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) | 
					
						
							|  |  |  |         return NULL; | 
					
						
							|  |  |  |     Py_DECREF(code); /* Only need the path info */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     return PyUnicode_FromString(modpath); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | /* Return a bool signifying whether the module is a package or not. */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | zipimporter_is_package(PyObject *obj, PyObject *args) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	ZipImporter *self = (ZipImporter *)obj; | 
					
						
							|  |  |  | 	char *fullname; | 
					
						
							| 
									
										
										
										
											2004-11-10 13:08:35 +00:00
										 |  |  | 	enum zi_module_info mi; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2003-02-17 18:05:20 +00:00
										 |  |  | 	if (!PyArg_ParseTuple(args, "s:zipimporter.is_package", | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 			      &fullname)) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	mi = get_module_info(self, fullname); | 
					
						
							|  |  |  | 	if (mi == MI_ERROR) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	if (mi == MI_NOT_FOUND) { | 
					
						
							|  |  |  | 		PyErr_Format(ZipImportError, "can't find module '%.200s'", | 
					
						
							|  |  |  | 			     fullname); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return PyBool_FromLong(mi == MI_PACKAGE); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | zipimporter_get_data(PyObject *obj, PyObject *args) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	ZipImporter *self = (ZipImporter *)obj; | 
					
						
							|  |  |  | 	char *path; | 
					
						
							|  |  |  | #ifdef ALTSEP
 | 
					
						
							| 
									
										
										
										
											2002-12-30 22:42:57 +00:00
										 |  |  | 	char *p, buf[MAXPATHLEN + 1]; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | #endif
 | 
					
						
							|  |  |  | 	PyObject *toc_entry; | 
					
						
							| 
									
										
										
										
											2006-02-16 14:30:23 +00:00
										 |  |  | 	Py_ssize_t len; | 
					
						
							| 
									
										
										
										
											2008-05-03 18:24:43 +00:00
										 |  |  | 	char *archive_str; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (!PyArg_ParseTuple(args, "s:zipimporter.get_data", &path)) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #ifdef ALTSEP
 | 
					
						
							|  |  |  | 	if (strlen(path) >= MAXPATHLEN) { | 
					
						
							|  |  |  | 		PyErr_SetString(ZipImportError, "path too long"); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	strcpy(buf, path); | 
					
						
							|  |  |  | 	for (p = buf; *p; p++) { | 
					
						
							|  |  |  | 		if (*p == ALTSEP) | 
					
						
							|  |  |  | 			*p = SEP; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	path = buf; | 
					
						
							|  |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 	archive_str = _PyUnicode_AsStringAndSize(self->archive, &len); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:44:03 +00:00
										 |  |  | 	if ((size_t)len < strlen(path) && | 
					
						
							| 
									
										
										
										
											2008-05-03 18:24:43 +00:00
										 |  |  | 	    strncmp(path, archive_str, len) == 0 && | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	    path[len] == SEP) { | 
					
						
							|  |  |  | 		path = path + len + 1; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	toc_entry = PyDict_GetItemString(self->files, path); | 
					
						
							|  |  |  | 	if (toc_entry == NULL) { | 
					
						
							| 
									
										
										
										
											2006-02-19 09:38:58 +00:00
										 |  |  | 		PyErr_SetFromErrnoWithFilename(PyExc_IOError, path); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2008-05-03 18:24:43 +00:00
										 |  |  | 	return get_data(archive_str, toc_entry); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | zipimporter_get_code(PyObject *obj, PyObject *args) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	ZipImporter *self = (ZipImporter *)obj; | 
					
						
							|  |  |  | 	char *fullname; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (!PyArg_ParseTuple(args, "s:zipimporter.get_code", &fullname)) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	return get_module_code(self, fullname, NULL, NULL); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | zipimporter_get_source(PyObject *obj, PyObject *args) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	ZipImporter *self = (ZipImporter *)obj; | 
					
						
							|  |  |  | 	PyObject *toc_entry; | 
					
						
							|  |  |  | 	char *fullname, *subname, path[MAXPATHLEN+1]; | 
					
						
							|  |  |  | 	int len; | 
					
						
							| 
									
										
										
										
											2004-11-10 13:08:35 +00:00
										 |  |  | 	enum zi_module_info mi; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (!PyArg_ParseTuple(args, "s:zipimporter.get_source", &fullname)) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	mi = get_module_info(self, fullname); | 
					
						
							|  |  |  | 	if (mi == MI_ERROR) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	if (mi == MI_NOT_FOUND) { | 
					
						
							|  |  |  | 		PyErr_Format(ZipImportError, "can't find module '%.200s'", | 
					
						
							|  |  |  | 			     fullname); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	subname = get_subname(fullname); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 	len = make_filename(_PyUnicode_AsString(self->prefix), subname, path); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	if (len < 0) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (mi == MI_PACKAGE) { | 
					
						
							|  |  |  | 		path[len] = SEP; | 
					
						
							|  |  |  | 		strcpy(path + len + 1, "__init__.py"); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	else | 
					
						
							|  |  |  | 		strcpy(path + len, ".py"); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	toc_entry = PyDict_GetItemString(self->files, path); | 
					
						
							| 
									
										
										
										
											2007-08-03 18:40:49 +00:00
										 |  |  | 	if (toc_entry != NULL) { | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 		PyObject *bytes = get_data(_PyUnicode_AsString(self->archive), toc_entry); | 
					
						
							| 
									
										
										
										
											2008-09-06 20:13:06 +00:00
										 |  |  | 		PyObject *res = PyUnicode_FromString(PyBytes_AsString(bytes)); | 
					
						
							| 
									
										
										
										
											2007-08-03 18:40:49 +00:00
										 |  |  | 		Py_XDECREF(bytes); | 
					
						
							|  |  |  | 		return res; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	/* we have the module, but no source */ | 
					
						
							|  |  |  | 	Py_INCREF(Py_None); | 
					
						
							|  |  |  | 	return Py_None; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | PyDoc_STRVAR(doc_find_module, | 
					
						
							|  |  |  | "find_module(fullname, path=None) -> self or None.\n\
 | 
					
						
							|  |  |  | \n\ | 
					
						
							|  |  |  | Search for a module specified by 'fullname'. 'fullname' must be the\n\ | 
					
						
							|  |  |  | fully qualified (dotted) module name. It returns the zipimporter\n\ | 
					
						
							|  |  |  | instance itself if the module was found, or None if it wasn't.\n\ | 
					
						
							|  |  |  | The optional 'path' argument is ignored -- it's there for compatibility\n\ | 
					
						
							|  |  |  | with the importer protocol."); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | PyDoc_STRVAR(doc_load_module, | 
					
						
							|  |  |  | "load_module(fullname) -> module.\n\
 | 
					
						
							|  |  |  | \n\ | 
					
						
							|  |  |  | Load the module specified by 'fullname'. 'fullname' must be the\n\ | 
					
						
							|  |  |  | fully qualified (dotted) module name. It returns the imported\n\ | 
					
						
							|  |  |  | module, or raises ZipImportError if it wasn't found."); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | PyDoc_STRVAR(doc_get_data, | 
					
						
							|  |  |  | "get_data(pathname) -> string with file data.\n\
 | 
					
						
							|  |  |  | \n\ | 
					
						
							|  |  |  | Return the data associated with 'pathname'. Raise IOError if\n\ | 
					
						
							|  |  |  | the file wasn't found."); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | PyDoc_STRVAR(doc_is_package, | 
					
						
							|  |  |  | "is_package(fullname) -> bool.\n\
 | 
					
						
							|  |  |  | \n\ | 
					
						
							|  |  |  | Return True if the module specified by fullname is a package.\n\ | 
					
						
							|  |  |  | Raise ZipImportError is the module couldn't be found."); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | PyDoc_STRVAR(doc_get_code, | 
					
						
							|  |  |  | "get_code(fullname) -> code object.\n\
 | 
					
						
							|  |  |  | \n\ | 
					
						
							|  |  |  | Return the code object for the specified module. Raise ZipImportError\n\ | 
					
						
							|  |  |  | is the module couldn't be found."); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | PyDoc_STRVAR(doc_get_source, | 
					
						
							|  |  |  | "get_source(fullname) -> source string.\n\
 | 
					
						
							|  |  |  | \n\ | 
					
						
							|  |  |  | Return the source code for the specified module. Raise ZipImportError\n\ | 
					
						
							|  |  |  | is the module couldn't be found, return None if the archive does\n\ | 
					
						
							|  |  |  | contain the module, but has no source for it."); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-14 11:50:48 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | PyDoc_STRVAR(doc_get_filename, | 
					
						
							| 
									
										
										
										
											2009-02-08 03:37:27 +00:00
										 |  |  | "get_filename(fullname) -> filename string.\n\
 | 
					
						
							| 
									
										
										
										
											2008-12-14 11:50:48 +00:00
										 |  |  | \n\ | 
					
						
							|  |  |  | Return the filename for the specified module."); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | static PyMethodDef zipimporter_methods[] = { | 
					
						
							|  |  |  | 	{"find_module", zipimporter_find_module, METH_VARARGS, | 
					
						
							|  |  |  | 	 doc_find_module}, | 
					
						
							|  |  |  | 	{"load_module", zipimporter_load_module, METH_VARARGS, | 
					
						
							|  |  |  | 	 doc_load_module}, | 
					
						
							|  |  |  | 	{"get_data", zipimporter_get_data, METH_VARARGS, | 
					
						
							|  |  |  | 	 doc_get_data}, | 
					
						
							|  |  |  | 	{"get_code", zipimporter_get_code, METH_VARARGS, | 
					
						
							|  |  |  | 	 doc_get_code}, | 
					
						
							|  |  |  | 	{"get_source", zipimporter_get_source, METH_VARARGS, | 
					
						
							|  |  |  | 	 doc_get_source}, | 
					
						
							| 
									
										
										
										
											2009-02-08 03:37:27 +00:00
										 |  |  | 	{"get_filename", zipimporter_get_filename, METH_VARARGS, | 
					
						
							| 
									
										
										
										
											2008-12-14 11:50:48 +00:00
										 |  |  | 	 doc_get_filename}, | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	{"is_package", zipimporter_is_package, METH_VARARGS, | 
					
						
							|  |  |  | 	 doc_is_package}, | 
					
						
							|  |  |  | 	{NULL,		NULL}	/* sentinel */ | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static PyMemberDef zipimporter_members[] = { | 
					
						
							|  |  |  | 	{"archive",  T_OBJECT, offsetof(ZipImporter, archive),  READONLY}, | 
					
						
							|  |  |  | 	{"prefix",   T_OBJECT, offsetof(ZipImporter, prefix),   READONLY}, | 
					
						
							|  |  |  | 	{"_files",   T_OBJECT, offsetof(ZipImporter, files),    READONLY}, | 
					
						
							|  |  |  | 	{NULL} | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | PyDoc_STRVAR(zipimporter_doc, | 
					
						
							|  |  |  | "zipimporter(archivepath) -> zipimporter object\n\
 | 
					
						
							|  |  |  | \n\ | 
					
						
							|  |  |  | Create a new zipimporter instance. 'archivepath' must be a path to\n\ | 
					
						
							| 
									
										
											  
											
												Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines
  #2709 followup: better description of Tk's pros and cons.
........
  r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines
  #1326: document and test zipimporter.archive and zipimporter.prefix.
........
  r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2816: clarify error messages for EOF while scanning strings.
........
  r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines
  #2787: Flush stdout after writing test name, helpful when running
  hanging or long-running tests. Patch by Adam Olsen.
........
  r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines
  #2803: fix wrong invocation of heappush in seldom-reached code.
  Thanks to Matt Harden.
........
  r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines
  broaden .bzrignore
........
  r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line
  Add message to test assertion
........
  r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line
  Try setting HOME env.var to fix test on Win32
........
  r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines
  #2809 followup: even better split docstring.
........
  r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines
  - #2250: Exceptions raised during evaluation of names in rlcompleter's
    ``Completer.complete()`` method are now caught and ignored.
........
  r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines
  Clarify os.strerror()s exception behavior.
........
  r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines
  #2535: remove duplicated method.
........
  r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines
  Moved the Queue module stub in lib-old.
........
											
										 
											2008-05-16 00:41:41 +00:00
										 |  |  | a zipfile, or to a specific path inside a zipfile. For example, it can be\n\ | 
					
						
							|  |  |  | '/tmp/myimport.zip', or '/tmp/myimport.zip/mydirectory', if mydirectory is a\n\ | 
					
						
							|  |  |  | valid directory inside the archive.\n\ | 
					
						
							|  |  |  | \n\ | 
					
						
							|  |  |  | 'ZipImportError is raised if 'archivepath' doesn't point to a valid Zip\n\ | 
					
						
							|  |  |  | archive.\n\ | 
					
						
							|  |  |  | \n\ | 
					
						
							|  |  |  | The 'archive' attribute of zipimporter objects contains the name of the\n\ | 
					
						
							|  |  |  | zipfile targeted."); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | #define DEFERRED_ADDRESS(ADDR) 0
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static PyTypeObject ZipImporter_Type = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 56467-56482 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
  r56477 | martin.v.loewis | 2007-07-21 09:04:38 +0200 (Sa, 21 Jul 2007) | 11 lines
  Merged revisions 56466-56476 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r56476 | martin.v.loewis | 2007-07-21 08:55:02 +0200 (Sa, 21 Jul 2007) | 4 lines
    PEP 3123: Provide forward compatibility with Python 3.0, while keeping
    backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and
    PyVarObject_HEAD_INIT.
  ........
................
  r56478 | martin.v.loewis | 2007-07-21 09:47:23 +0200 (Sa, 21 Jul 2007) | 2 lines
  PEP 3123: Use proper C inheritance for PyObject.
................
  r56479 | martin.v.loewis | 2007-07-21 10:06:55 +0200 (Sa, 21 Jul 2007) | 3 lines
  Add longintrepr.h to Python.h, so that the compiler can
  see that PyFalse is really some kind of PyObject*.
................
  r56480 | martin.v.loewis | 2007-07-21 10:47:18 +0200 (Sa, 21 Jul 2007) | 2 lines
  Qualify SHIFT, MASK, BASE.
................
  r56482 | martin.v.loewis | 2007-07-21 19:10:57 +0200 (Sa, 21 Jul 2007) | 2 lines
  Correctly refer to _ob_next.
................
											
										 
											2007-07-21 17:22:18 +00:00
										 |  |  | 	PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	"zipimport.zipimporter", | 
					
						
							|  |  |  | 	sizeof(ZipImporter), | 
					
						
							|  |  |  | 	0,					/* tp_itemsize */ | 
					
						
							|  |  |  | 	(destructor)zipimporter_dealloc,	/* tp_dealloc */ | 
					
						
							|  |  |  | 	0,					/* tp_print */ | 
					
						
							|  |  |  | 	0,					/* tp_getattr */ | 
					
						
							|  |  |  | 	0,					/* tp_setattr */ | 
					
						
							| 
									
										
										
										
											2009-02-02 20:36:42 +00:00
										 |  |  | 	0,					/* tp_reserved */ | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	(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 */ | 
					
						
							|  |  |  | 	zipimporter_doc,			/* tp_doc */ | 
					
						
							|  |  |  | 	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 */ | 
					
						
							|  |  |  | 	(initproc)zipimporter_init,		/* tp_init */ | 
					
						
							|  |  |  | 	PyType_GenericAlloc,			/* tp_alloc */ | 
					
						
							|  |  |  | 	PyType_GenericNew,			/* tp_new */ | 
					
						
							|  |  |  | 	PyObject_GC_Del,			/* tp_free */ | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* implementation */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Given a buffer, return the long that is represented by the first
 | 
					
						
							|  |  |  |    4 bytes, encoded as little endian. This partially reimplements | 
					
						
							|  |  |  |    marshal.c:r_long() */ | 
					
						
							|  |  |  | static long | 
					
						
							|  |  |  | get_long(unsigned char *buf) { | 
					
						
							|  |  |  | 	long x; | 
					
						
							|  |  |  | 	x =  buf[0]; | 
					
						
							|  |  |  | 	x |= (long)buf[1] <<  8; | 
					
						
							|  |  |  | 	x |= (long)buf[2] << 16; | 
					
						
							|  |  |  | 	x |= (long)buf[3] << 24; | 
					
						
							|  |  |  | #if SIZEOF_LONG > 4
 | 
					
						
							|  |  |  | 	/* Sign extension for 64-bit machines */ | 
					
						
							|  |  |  | 	x |= -(x & 0x80000000L); | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | 	return x; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							|  |  |  |    read_directory(archive) -> files dict (new reference) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    Given a path to a Zip archive, build a dict, mapping file names | 
					
						
							|  |  |  |    (local to the archive, using SEP as a separator) to toc entries. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    A toc_entry is a tuple: | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-11-11 19:34:56 +00:00
										 |  |  |        (__file__,      # value to use for __file__, available for all files | 
					
						
							|  |  |  |         compress,      # compression kind; 0 for uncompressed | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  |         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 | 
					
						
							|  |  |  |        ) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    Directories can be recognized by the trailing SEP in the name, | 
					
						
							|  |  |  |    data_size and file_offset are 0. | 
					
						
							|  |  |  | */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | read_directory(char *archive) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	PyObject *files = NULL; | 
					
						
							|  |  |  | 	FILE *fp; | 
					
						
							|  |  |  | 	long compress, crc, data_size, file_size, file_offset, date, time; | 
					
						
							| 
									
										
										
										
											2003-07-22 18:10:15 +00:00
										 |  |  | 	long header_offset, name_size, header_size, header_position; | 
					
						
							| 
									
										
										
										
											2006-01-08 01:03:36 +00:00
										 |  |  | 	long i, l, count; | 
					
						
							|  |  |  | 	size_t length; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	char path[MAXPATHLEN + 5]; | 
					
						
							|  |  |  | 	char name[MAXPATHLEN + 5]; | 
					
						
							|  |  |  | 	char *p, endof_central_dir[22]; | 
					
						
							| 
									
										
										
										
											2003-07-22 18:10:15 +00:00
										 |  |  | 	long arc_offset; /* offset from beginning of file to start of zip-archive */ | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (strlen(archive) > MAXPATHLEN) { | 
					
						
							|  |  |  | 		PyErr_SetString(PyExc_OverflowError, | 
					
						
							|  |  |  | 				"Zip path name is too long"); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	strcpy(path, archive); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	fp = fopen(archive, "rb"); | 
					
						
							|  |  |  | 	if (fp == NULL) { | 
					
						
							|  |  |  | 		PyErr_Format(ZipImportError, "can't open Zip file: " | 
					
						
							|  |  |  | 			     "'%.200s'", archive); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2003-02-28 08:54:01 +00:00
										 |  |  | 	fseek(fp, -22, SEEK_END); | 
					
						
							| 
									
										
										
										
											2003-07-22 18:10:15 +00:00
										 |  |  | 	header_position = ftell(fp); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	if (fread(endof_central_dir, 1, 22, fp) != 22) { | 
					
						
							|  |  |  | 		fclose(fp); | 
					
						
							|  |  |  | 		PyErr_Format(ZipImportError, "can't read Zip file: " | 
					
						
							|  |  |  | 			     "'%.200s'", archive); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2002-12-30 23:06:14 +00:00
										 |  |  | 	if (get_long((unsigned char *)endof_central_dir) != 0x06054B50) { | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		/* Bad: End of Central Dir signature */ | 
					
						
							|  |  |  | 		fclose(fp); | 
					
						
							|  |  |  | 		PyErr_Format(ZipImportError, "not a Zip file: " | 
					
						
							|  |  |  | 			     "'%.200s'", archive); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2003-07-22 18:10:15 +00:00
										 |  |  | 	header_size = get_long((unsigned char *)endof_central_dir + 12); | 
					
						
							| 
									
										
										
										
											2002-12-30 23:06:14 +00:00
										 |  |  | 	header_offset = get_long((unsigned char *)endof_central_dir + 16); | 
					
						
							| 
									
										
										
										
											2003-07-22 18:10:15 +00:00
										 |  |  | 	arc_offset = header_position - header_offset - header_size; | 
					
						
							|  |  |  | 	header_offset += arc_offset; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	files = PyDict_New(); | 
					
						
							|  |  |  | 	if (files == NULL) | 
					
						
							|  |  |  | 		goto error; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	length = (long)strlen(path); | 
					
						
							|  |  |  | 	path[length] = SEP; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	/* Start of Central Directory */ | 
					
						
							|  |  |  | 	count = 0; | 
					
						
							|  |  |  | 	for (;;) { | 
					
						
							|  |  |  | 		PyObject *t; | 
					
						
							|  |  |  | 		int err; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		fseek(fp, header_offset, 0);  /* Start of file header */ | 
					
						
							|  |  |  | 		l = PyMarshal_ReadLongFromFile(fp); | 
					
						
							|  |  |  | 		if (l != 0x02014B50) | 
					
						
							|  |  |  | 			break;	/* Bad: Central Dir File Header */ | 
					
						
							|  |  |  | 		fseek(fp, header_offset + 10, 0); | 
					
						
							|  |  |  | 		compress = PyMarshal_ReadShortFromFile(fp); | 
					
						
							|  |  |  | 		time = PyMarshal_ReadShortFromFile(fp); | 
					
						
							|  |  |  | 		date = PyMarshal_ReadShortFromFile(fp); | 
					
						
							|  |  |  | 		crc = PyMarshal_ReadLongFromFile(fp); | 
					
						
							|  |  |  | 		data_size = PyMarshal_ReadLongFromFile(fp); | 
					
						
							|  |  |  | 		file_size = PyMarshal_ReadLongFromFile(fp); | 
					
						
							|  |  |  | 		name_size = PyMarshal_ReadShortFromFile(fp); | 
					
						
							|  |  |  | 		header_size = 46 + name_size + | 
					
						
							|  |  |  | 		   PyMarshal_ReadShortFromFile(fp) + | 
					
						
							|  |  |  | 		   PyMarshal_ReadShortFromFile(fp); | 
					
						
							|  |  |  | 		fseek(fp, header_offset + 42, 0); | 
					
						
							| 
									
										
										
										
											2003-07-22 18:10:15 +00:00
										 |  |  | 		file_offset = PyMarshal_ReadLongFromFile(fp) + arc_offset; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		if (name_size > MAXPATHLEN) | 
					
						
							|  |  |  | 			name_size = MAXPATHLEN; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		p = name; | 
					
						
							|  |  |  | 		for (i = 0; i < name_size; i++) { | 
					
						
							|  |  |  | 			*p = (char)getc(fp); | 
					
						
							|  |  |  | 			if (*p == '/') | 
					
						
							|  |  |  | 				*p = SEP; | 
					
						
							|  |  |  | 			p++; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		*p = 0;	/* Add terminating null byte */ | 
					
						
							|  |  |  | 		header_offset += header_size; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		strncpy(path + length + 1, name, MAXPATHLEN - length - 1); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		t = Py_BuildValue("siiiiiii", path, compress, data_size, | 
					
						
							|  |  |  | 				  file_size, file_offset, time, date, crc); | 
					
						
							|  |  |  | 		if (t == NULL) | 
					
						
							|  |  |  | 			goto error; | 
					
						
							|  |  |  | 		err = PyDict_SetItemString(files, name, t); | 
					
						
							|  |  |  | 		Py_DECREF(t); | 
					
						
							|  |  |  | 		if (err != 0) | 
					
						
							|  |  |  | 			goto error; | 
					
						
							|  |  |  | 		count++; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	fclose(fp); | 
					
						
							|  |  |  | 	if (Py_VerboseFlag) | 
					
						
							|  |  |  | 		PySys_WriteStderr("# zipimport: found %ld names in %s\n", | 
					
						
							|  |  |  | 			count, archive); | 
					
						
							|  |  |  | 	return files; | 
					
						
							|  |  |  | error: | 
					
						
							|  |  |  | 	fclose(fp); | 
					
						
							|  |  |  | 	Py_XDECREF(files); | 
					
						
							|  |  |  | 	return NULL; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Return the zlib.decompress function object, or NULL if zlib couldn't
 | 
					
						
							|  |  |  |    be imported. The function is cached when found, so subsequent calls | 
					
						
							|  |  |  |    don't import zlib again. Returns a *borrowed* reference. | 
					
						
							|  |  |  |    XXX This makes zlib.decompress immortal. */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | get_decompress_func(void) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	static PyObject *decompress = NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (decompress == NULL) { | 
					
						
							|  |  |  | 		PyObject *zlib; | 
					
						
							|  |  |  | 		static int importing_zlib = 0; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		if (importing_zlib != 0) | 
					
						
							|  |  |  | 			/* Someone has a zlib.py[co] in their Zip file;
 | 
					
						
							|  |  |  | 			   let's avoid a stack overflow. */ | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		importing_zlib = 1; | 
					
						
							| 
									
										
											  
											
												Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
  Made vs9to8 Unix compatible
........
  r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
  Patch #1696.  Don't attempt to close None in dry-run mode.
........
  r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
  Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
  the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
  r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
  documentation. The only significant difference is that round(x) returns a float
  to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
  r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
  Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
  r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
  Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
  Regular Expression inline flags not handled correctly for some unicode
  characters.  (Forward port from 2.5.2.)
........
  r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
  Added math.isinf() and math.isnan()
........
  r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
  Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
  r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
  Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
  Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
  r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
  Added copysign(x, y) function to the math module
........
											
										 
											2008-01-03 23:01:04 +00:00
										 |  |  | 		zlib = PyImport_ImportModuleNoBlock("zlib"); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		importing_zlib = 0; | 
					
						
							|  |  |  | 		if (zlib != NULL) { | 
					
						
							|  |  |  | 			decompress = PyObject_GetAttrString(zlib, | 
					
						
							|  |  |  | 							    "decompress"); | 
					
						
							|  |  |  | 			Py_DECREF(zlib); | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		else | 
					
						
							|  |  |  | 			PyErr_Clear(); | 
					
						
							|  |  |  | 		if (Py_VerboseFlag) | 
					
						
							|  |  |  | 			PySys_WriteStderr("# zipimport: zlib %s\n", | 
					
						
							|  |  |  | 				zlib != NULL ? "available": "UNAVAILABLE"); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return decompress; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Given a path to a Zip file and a toc_entry, return the (uncompressed)
 | 
					
						
							|  |  |  |    data as a new reference. */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | get_data(char *archive, PyObject *toc_entry) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	PyObject *raw_data, *data = NULL, *decompress; | 
					
						
							|  |  |  | 	char *buf; | 
					
						
							|  |  |  | 	FILE *fp; | 
					
						
							| 
									
										
										
										
											2006-02-15 17:27:45 +00:00
										 |  |  | 	int err; | 
					
						
							|  |  |  | 	Py_ssize_t bytes_read = 0; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	long l; | 
					
						
							|  |  |  | 	char *datapath; | 
					
						
							| 
									
										
										
										
											2007-08-26 05:08:21 +00:00
										 |  |  | 	long compress, data_size, file_size, file_offset, bytes_size; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	long time, date, crc; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2003-02-18 03:37:49 +00:00
										 |  |  | 	if (!PyArg_ParseTuple(toc_entry, "slllllll", &datapath, &compress, | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 			      &data_size, &file_size, &file_offset, &time, | 
					
						
							|  |  |  | 			      &date, &crc)) { | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	fp = fopen(archive, "rb"); | 
					
						
							|  |  |  | 	if (!fp) { | 
					
						
							|  |  |  | 		PyErr_Format(PyExc_IOError, | 
					
						
							|  |  |  | 		   "zipimport: can not open file %s", archive); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	/* Check to make sure the local file header is correct */ | 
					
						
							|  |  |  | 	fseek(fp, file_offset, 0); | 
					
						
							|  |  |  | 	l = PyMarshal_ReadLongFromFile(fp); | 
					
						
							|  |  |  | 	if (l != 0x04034B50) { | 
					
						
							|  |  |  | 		/* Bad: Local File Header */ | 
					
						
							|  |  |  | 		PyErr_Format(ZipImportError, | 
					
						
							|  |  |  | 			     "bad local file header in %s", | 
					
						
							|  |  |  | 			     archive); | 
					
						
							|  |  |  | 		fclose(fp); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	fseek(fp, file_offset + 26, 0); | 
					
						
							|  |  |  | 	l = 30 + PyMarshal_ReadShortFromFile(fp) + | 
					
						
							|  |  |  | 	    PyMarshal_ReadShortFromFile(fp);	/* local header size */ | 
					
						
							|  |  |  | 	file_offset += l;	/* Start of file data */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-26 05:08:21 +00:00
										 |  |  | 	bytes_size = compress == 0 ? data_size : data_size + 1; | 
					
						
							|  |  |  | 	if (bytes_size == 0) | 
					
						
							|  |  |  | 		bytes_size++; | 
					
						
							| 
									
										
										
										
											2008-09-06 20:13:06 +00:00
										 |  |  | 	raw_data = PyBytes_FromStringAndSize((char *)NULL, bytes_size); | 
					
						
							| 
									
										
										
										
											2007-08-26 05:08:21 +00:00
										 |  |  | 					      | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	if (raw_data == NULL) { | 
					
						
							|  |  |  | 		fclose(fp); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2008-09-06 20:13:06 +00:00
										 |  |  | 	buf = PyBytes_AsString(raw_data); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	err = fseek(fp, file_offset, 0); | 
					
						
							|  |  |  | 	if (err == 0) | 
					
						
							|  |  |  | 		bytes_read = fread(buf, 1, data_size, fp); | 
					
						
							|  |  |  | 	fclose(fp); | 
					
						
							|  |  |  | 	if (err || bytes_read != data_size) { | 
					
						
							|  |  |  | 		PyErr_SetString(PyExc_IOError, | 
					
						
							|  |  |  | 				"zipimport: can't read data"); | 
					
						
							|  |  |  | 		Py_DECREF(raw_data); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (compress != 0) { | 
					
						
							|  |  |  | 		buf[data_size] = 'Z';  /* saw this in zipfile.py */ | 
					
						
							|  |  |  | 		data_size++; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	buf[data_size] = '\0'; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-03 18:40:49 +00:00
										 |  |  | 	if (compress == 0) {  /* data is not compressed */ | 
					
						
							| 
									
										
										
										
											2008-09-06 20:13:06 +00:00
										 |  |  | 		data = PyBytes_FromStringAndSize(buf, data_size); | 
					
						
							| 
									
										
										
										
											2007-08-17 14:33:37 +00:00
										 |  |  | 		Py_DECREF(raw_data); | 
					
						
							|  |  |  | 		return data; | 
					
						
							| 
									
										
										
										
											2007-08-03 18:40:49 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	/* Decompress with zlib */ | 
					
						
							|  |  |  | 	decompress = get_decompress_func(); | 
					
						
							|  |  |  | 	if (decompress == NULL) { | 
					
						
							|  |  |  | 		PyErr_SetString(ZipImportError, | 
					
						
							|  |  |  | 				"can't decompress data; " | 
					
						
							|  |  |  | 				"zlib not available"); | 
					
						
							|  |  |  | 		goto error; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2003-09-07 13:36:48 +00:00
										 |  |  | 	data = PyObject_CallFunction(decompress, "Oi", raw_data, -15); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | error: | 
					
						
							|  |  |  | 	Py_DECREF(raw_data); | 
					
						
							|  |  |  | 	return data; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* 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) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	time_t d = t1 - t2; | 
					
						
							|  |  |  | 	if (d < 0) | 
					
						
							|  |  |  | 		d = -d; | 
					
						
							|  |  |  | 	/* dostime only stores even seconds, so be lenient */ | 
					
						
							|  |  |  | 	return d <= 1; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Given the contents of a .py[co] file in a buffer, unmarshal the data
 | 
					
						
							|  |  |  |    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 * | 
					
						
							|  |  |  | unmarshal_code(char *pathname, PyObject *data, time_t mtime) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	PyObject *code; | 
					
						
							| 
									
										
										
										
											2008-09-06 20:13:06 +00:00
										 |  |  | 	char *buf = PyBytes_AsString(data); | 
					
						
							|  |  |  | 	Py_ssize_t size = PyBytes_Size(data); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (size <= 9) { | 
					
						
							|  |  |  | 		PyErr_SetString(ZipImportError, | 
					
						
							|  |  |  | 				"bad pyc data"); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2002-12-30 23:06:14 +00:00
										 |  |  | 	if (get_long((unsigned char *)buf) != PyImport_GetMagicNumber()) { | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		if (Py_VerboseFlag) | 
					
						
							|  |  |  | 			PySys_WriteStderr("# %s has bad magic\n", | 
					
						
							|  |  |  | 					  pathname); | 
					
						
							|  |  |  | 		Py_INCREF(Py_None); | 
					
						
							|  |  |  | 		return Py_None;  /* signal caller to try alternative */ | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2003-01-03 11:18:56 +00:00
										 |  |  | 	if (mtime != 0 && !eq_mtime(get_long((unsigned char *)buf + 4), | 
					
						
							|  |  |  | 				    mtime)) { | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		if (Py_VerboseFlag) | 
					
						
							|  |  |  | 			PySys_WriteStderr("# %s has bad mtime\n", | 
					
						
							|  |  |  | 					  pathname); | 
					
						
							|  |  |  | 		Py_INCREF(Py_None); | 
					
						
							|  |  |  | 		return Py_None;  /* signal caller to try alternative */ | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	code = PyMarshal_ReadObjectFromString(buf + 8, size - 8); | 
					
						
							|  |  |  | 	if (code == NULL) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	if (!PyCode_Check(code)) { | 
					
						
							|  |  |  | 		Py_DECREF(code); | 
					
						
							|  |  |  | 		PyErr_Format(PyExc_TypeError, | 
					
						
							|  |  |  | 		     "compiled module %.200s is not a code object", | 
					
						
							|  |  |  | 		     pathname); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return code; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Replace any occurances of "\r\n?" in the input string with "\n".
 | 
					
						
							|  |  |  |    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) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2008-09-06 20:13:06 +00:00
										 |  |  | 	char *buf, *q, *p = PyBytes_AsString(source); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	PyObject *fixed_source; | 
					
						
							| 
									
										
										
										
											2007-08-03 18:40:49 +00:00
										 |  |  | 	int len = 0; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-03 18:40:49 +00:00
										 |  |  | 	if (!p) { | 
					
						
							| 
									
										
										
										
											2008-09-06 20:13:06 +00:00
										 |  |  | 		return PyBytes_FromStringAndSize("\n\0", 2); | 
					
						
							| 
									
										
										
										
											2007-08-03 18:40:49 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
											  
											
												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
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2003-01-03 11:18:56 +00:00
										 |  |  | 	/* one char extra for trailing \n and one for terminating \0 */ | 
					
						
							| 
									
										
										
										
											2008-09-06 20:13:06 +00:00
										 |  |  | 	buf = (char *)PyMem_Malloc(PyBytes_Size(source) + 2); | 
					
						
							| 
									
										
										
										
											2003-01-03 11:18:56 +00:00
										 |  |  | 	if (buf == NULL) { | 
					
						
							|  |  |  | 		PyErr_SetString(PyExc_MemoryError, | 
					
						
							|  |  |  | 				"zipimport: no memory to allocate " | 
					
						
							|  |  |  | 				"source buffer"); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2003-01-03 11:18:56 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	/* replace "\r\n?" by "\n" */ | 
					
						
							| 
									
										
										
										
											2003-02-17 18:05:20 +00:00
										 |  |  | 	for (q = buf; *p != '\0'; p++) { | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		if (*p == '\r') { | 
					
						
							|  |  |  | 			*q++ = '\n'; | 
					
						
							| 
									
										
										
										
											2003-01-03 11:18:56 +00:00
										 |  |  | 			if (*(p + 1) == '\n') | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 				p++; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		else | 
					
						
							|  |  |  | 			*q++ = *p; | 
					
						
							| 
									
										
										
										
											2007-08-03 18:40:49 +00:00
										 |  |  | 		len++; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	} | 
					
						
							|  |  |  | 	*q++ = '\n';  /* add trailing \n */ | 
					
						
							|  |  |  | 	*q = '\0'; | 
					
						
							| 
									
										
										
										
											2008-09-06 20:13:06 +00:00
										 |  |  | 	fixed_source = PyBytes_FromStringAndSize(buf, len + 2); | 
					
						
							| 
									
										
										
										
											2003-01-03 11:18:56 +00:00
										 |  |  | 	PyMem_Free(buf); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	return fixed_source; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Given a string buffer containing Python source code, compile it
 | 
					
						
							|  |  |  |    return and return a code object as a new reference. */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | compile_source(char *pathname, PyObject *source) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	PyObject *code, *fixed_source; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	fixed_source = normalize_line_endings(source); | 
					
						
							|  |  |  | 	if (fixed_source == NULL) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-09-06 20:13:06 +00:00
										 |  |  | 	code = Py_CompileString(PyBytes_AsString(fixed_source), pathname, | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 				Py_file_input); | 
					
						
							|  |  |  | 	Py_DECREF(fixed_source); | 
					
						
							|  |  |  | 	return code; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* 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
										 |  |  | { | 
					
						
							|  |  |  | 	struct tm 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
										 |  |  | 	memset((void *) &stm, '\0', sizeof(stm)); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +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; | 
					
						
							| 
									
										
										
										
											2003-04-08 20:07:15 +00:00
										 |  |  | 	stm.tm_isdst =   -1; /* wday/yday is ignored */ | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	return mktime(&stm); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Given a path to a .pyc or .pyo file in the archive, return the
 | 
					
						
							|  |  |  |    modifictaion time of the matching .py file, or 0 if no source | 
					
						
							|  |  |  |    is available. */ | 
					
						
							|  |  |  | static time_t | 
					
						
							|  |  |  | get_mtime_of_source(ZipImporter *self, char *path) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	PyObject *toc_entry; | 
					
						
							|  |  |  | 	time_t mtime = 0; | 
					
						
							| 
									
										
										
										
											2006-02-15 17:27:45 +00:00
										 |  |  | 	Py_ssize_t lastchar = strlen(path) - 1; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	char savechar = path[lastchar]; | 
					
						
							|  |  |  | 	path[lastchar] = '\0';  /* strip 'c' or 'o' from *.py[co] */ | 
					
						
							|  |  |  | 	toc_entry = PyDict_GetItemString(self->files, path); | 
					
						
							|  |  |  | 	if (toc_entry != NULL && PyTuple_Check(toc_entry) && | 
					
						
							|  |  |  | 	    PyTuple_Size(toc_entry) == 8) { | 
					
						
							| 
									
										
										
										
											2002-12-31 09:51:59 +00:00
										 |  |  | 		/* fetch the time stamp of the .py file for comparison
 | 
					
						
							|  |  |  | 		   with an embedded pyc time stamp */ | 
					
						
							|  |  |  | 		int time, date; | 
					
						
							| 
									
										
										
										
											2007-12-02 14:31:20 +00:00
										 |  |  | 		time = PyLong_AsLong(PyTuple_GetItem(toc_entry, 5)); | 
					
						
							|  |  |  | 		date = PyLong_AsLong(PyTuple_GetItem(toc_entry, 6)); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		mtime = parse_dostime(time, date); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	path[lastchar] = savechar; | 
					
						
							|  |  |  | 	return mtime; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Return the code object for the module named by 'fullname' from the
 | 
					
						
							|  |  |  |    Zip archive as a new reference. */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | get_code_from_data(ZipImporter *self, int ispackage, int isbytecode, | 
					
						
							|  |  |  | 		   time_t mtime, PyObject *toc_entry) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	PyObject *data, *code; | 
					
						
							|  |  |  | 	char *modpath; | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 	char *archive = _PyUnicode_AsString(self->archive); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (archive == NULL) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	data = get_data(archive, toc_entry); | 
					
						
							|  |  |  | 	if (data == NULL) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 	modpath = _PyUnicode_AsString(PyTuple_GetItem(toc_entry, 0)); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (isbytecode) { | 
					
						
							|  |  |  | 		code = unmarshal_code(modpath, data, mtime); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	else { | 
					
						
							|  |  |  | 		code = compile_source(modpath, data); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	Py_DECREF(data); | 
					
						
							|  |  |  | 	return code; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Get the code object assoiciated with the module specified by
 | 
					
						
							|  |  |  |    'fullname'. */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | get_module_code(ZipImporter *self, char *fullname, | 
					
						
							|  |  |  | 		int *p_ispackage, char **p_modpath) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	PyObject *toc_entry; | 
					
						
							|  |  |  | 	char *subname, path[MAXPATHLEN + 1]; | 
					
						
							|  |  |  | 	int len; | 
					
						
							|  |  |  | 	struct st_zip_searchorder *zso; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	subname = get_subname(fullname); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 	len = make_filename(_PyUnicode_AsString(self->prefix), subname, path); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	if (len < 0) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	for (zso = zip_searchorder; *zso->suffix; zso++) { | 
					
						
							|  |  |  | 		PyObject *code = NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		strcpy(path + len, zso->suffix); | 
					
						
							|  |  |  | 		if (Py_VerboseFlag > 1) | 
					
						
							|  |  |  | 			PySys_WriteStderr("# trying %s%c%s\n", | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 					  _PyUnicode_AsString(self->archive), | 
					
						
							| 
									
										
										
										
											2009-05-17 08:20:45 +00:00
										 |  |  | 					  (int)SEP, path); | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 		toc_entry = PyDict_GetItemString(self->files, path); | 
					
						
							|  |  |  | 		if (toc_entry != NULL) { | 
					
						
							|  |  |  | 			time_t mtime = 0; | 
					
						
							|  |  |  | 			int ispackage = zso->type & IS_PACKAGE; | 
					
						
							|  |  |  | 			int isbytecode = zso->type & IS_BYTECODE; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 			if (isbytecode) | 
					
						
							|  |  |  | 				mtime = get_mtime_of_source(self, path); | 
					
						
							|  |  |  | 			if (p_ispackage != NULL) | 
					
						
							|  |  |  | 				*p_ispackage = ispackage; | 
					
						
							|  |  |  | 			code = get_code_from_data(self, ispackage, | 
					
						
							|  |  |  | 						  isbytecode, mtime, | 
					
						
							|  |  |  | 						  toc_entry); | 
					
						
							|  |  |  | 			if (code == Py_None) { | 
					
						
							|  |  |  | 				/* bad magic number or non-matching mtime
 | 
					
						
							|  |  |  | 				   in byte code, try next */ | 
					
						
							|  |  |  | 				Py_DECREF(code); | 
					
						
							|  |  |  | 				continue; | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 			if (code != NULL && p_modpath != NULL) | 
					
						
							| 
									
										
										
										
											2008-08-07 18:54:33 +00:00
										 |  |  | 				*p_modpath = _PyUnicode_AsString( | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 					PyTuple_GetItem(toc_entry, 0)); | 
					
						
							|  |  |  | 			return code; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	PyErr_Format(ZipImportError, "can't find module '%.200s'", fullname); | 
					
						
							|  |  |  | 	return NULL; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* 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 = { | 
					
						
							|  |  |  | 	PyModuleDef_HEAD_INIT, | 
					
						
							|  |  |  | 	"zipimport", | 
					
						
							|  |  |  | 	zipimport_doc, | 
					
						
							|  |  |  | 	-1, | 
					
						
							|  |  |  | 	NULL, | 
					
						
							|  |  |  | 	NULL, | 
					
						
							|  |  |  | 	NULL, | 
					
						
							|  |  |  | 	NULL, | 
					
						
							|  |  |  | 	NULL | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											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
										 |  |  | { | 
					
						
							|  |  |  | 	PyObject *mod; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (PyType_Ready(&ZipImporter_Type) < 0) | 
					
						
							| 
									
										
										
										
											2008-06-11 05:26:20 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	/* Correct directory separator */ | 
					
						
							|  |  |  | 	zip_searchorder[0].suffix[0] = SEP; | 
					
						
							|  |  |  | 	zip_searchorder[1].suffix[0] = SEP; | 
					
						
							|  |  |  | 	zip_searchorder[2].suffix[0] = SEP; | 
					
						
							|  |  |  | 	if (Py_OptimizeFlag) { | 
					
						
							|  |  |  | 		/* Reverse *.pyc and *.pyo */ | 
					
						
							|  |  |  | 		struct st_zip_searchorder tmp; | 
					
						
							|  |  |  | 		tmp = zip_searchorder[0]; | 
					
						
							|  |  |  | 		zip_searchorder[0] = zip_searchorder[1]; | 
					
						
							|  |  |  | 		zip_searchorder[1] = tmp; | 
					
						
							|  |  |  | 		tmp = zip_searchorder[3]; | 
					
						
							|  |  |  | 		zip_searchorder[3] = zip_searchorder[4]; | 
					
						
							|  |  |  | 		zip_searchorder[4] = tmp; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-06-11 05:26:20 +00:00
										 |  |  | 	mod = PyModule_Create(&zipimportmodule); | 
					
						
							| 
									
										
										
										
											2006-03-07 15:39:21 +00:00
										 |  |  | 	if (mod == NULL) | 
					
						
							| 
									
										
										
										
											2008-06-11 05:26:20 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	ZipImportError = PyErr_NewException("zipimport.ZipImportError", | 
					
						
							|  |  |  | 					    PyExc_ImportError, NULL); | 
					
						
							|  |  |  | 	if (ZipImportError == NULL) | 
					
						
							| 
									
										
										
										
											2008-06-11 05:26:20 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	Py_INCREF(ZipImportError); | 
					
						
							|  |  |  | 	if (PyModule_AddObject(mod, "ZipImportError", | 
					
						
							|  |  |  | 			       ZipImportError) < 0) | 
					
						
							| 
									
										
										
										
											2008-06-11 05:26:20 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	Py_INCREF(&ZipImporter_Type); | 
					
						
							|  |  |  | 	if (PyModule_AddObject(mod, "zipimporter", | 
					
						
							|  |  |  | 			       (PyObject *)&ZipImporter_Type) < 0) | 
					
						
							| 
									
										
										
										
											2008-06-11 05:26:20 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2002-12-31 09:51:59 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	zip_directory_cache = PyDict_New(); | 
					
						
							|  |  |  | 	if (zip_directory_cache == NULL) | 
					
						
							| 
									
										
										
										
											2008-06-11 05:26:20 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | 	Py_INCREF(zip_directory_cache); | 
					
						
							|  |  |  | 	if (PyModule_AddObject(mod, "_zip_directory_cache", | 
					
						
							|  |  |  | 			       zip_directory_cache) < 0) | 
					
						
							| 
									
										
										
										
											2008-06-11 05:26:20 +00:00
										 |  |  | 		return NULL; | 
					
						
							|  |  |  | 	return mod; | 
					
						
							| 
									
										
										
										
											2002-12-30 22:08:05 +00:00
										 |  |  | } |