2008-01-25 08:18:43 -04:00
|
|
|
/* Author: Daniel Stutzbach */
|
|
|
|
|
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
|
|
#include "Python.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <stddef.h> /* For offsetof */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Known likely problems:
|
|
|
|
*
|
|
|
|
* - Files larger then 2**32-1
|
|
|
|
* - Files with unicode filenames
|
|
|
|
* - Passing numbers greater than 2**32-1 when an integer is expected
|
|
|
|
* - Making it work on Windows and other oddball platforms
|
|
|
|
*
|
|
|
|
* To Do:
|
|
|
|
*
|
|
|
|
* - autoconfify header file inclusion
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
/* can simulate truncate with Win32 API functions; see file_truncate */
|
|
|
|
#define HAVE_FTRUNCATE
|
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PyObject_HEAD
|
|
|
|
int fd;
|
2009-09-21 18:36:48 -03:00
|
|
|
unsigned int readable : 1;
|
|
|
|
unsigned int writable : 1;
|
|
|
|
signed int seekable : 2; /* -1 means unknown */
|
|
|
|
signed int closefd : 1;
|
2008-01-25 08:18:43 -04:00
|
|
|
PyObject *weakreflist;
|
|
|
|
} PyFileIOObject;
|
|
|
|
|
|
|
|
PyTypeObject PyFileIO_Type;
|
|
|
|
|
|
|
|
#define PyFileIO_Check(op) (PyObject_TypeCheck((op), &PyFileIO_Type))
|
|
|
|
|
2009-01-20 20:56:37 -04:00
|
|
|
static PyObject *
|
|
|
|
portable_lseek(int fd, PyObject *posobj, int whence);
|
|
|
|
|
2008-01-25 08:18:43 -04:00
|
|
|
/* Returns 0 on success, errno (which is < 0) on failure. */
|
|
|
|
static int
|
|
|
|
internal_close(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
int save_errno = 0;
|
|
|
|
if (self->fd >= 0) {
|
|
|
|
int fd = self->fd;
|
|
|
|
self->fd = -1;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
if (close(fd) < 0)
|
|
|
|
save_errno = errno;
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
}
|
|
|
|
return save_errno;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_close(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (!self->closefd) {
|
Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67245 | benjamin.peterson | 2008-11-17 23:05:19 +0100 (Mon, 17 Nov 2008) | 1 line
improve __hash__ docs
........
r67277 | skip.montanaro | 2008-11-19 04:35:41 +0100 (Wed, 19 Nov 2008) | 1 line
patch from issue 1108
........
r67289 | brett.cannon | 2008-11-19 21:29:39 +0100 (Wed, 19 Nov 2008) | 2 lines
Ignore .pyc and .pyo files.
........
r67295 | benjamin.peterson | 2008-11-20 05:05:12 +0100 (Thu, 20 Nov 2008) | 1 line
move useful sys.settrace information to the function's documentation from the debugger
........
r67301 | benjamin.peterson | 2008-11-20 22:25:31 +0100 (Thu, 20 Nov 2008) | 1 line
fix indentation and a sphinx warning
........
r67302 | benjamin.peterson | 2008-11-20 22:44:23 +0100 (Thu, 20 Nov 2008) | 1 line
oops! didn't mean to disable that test
........
r67303 | benjamin.peterson | 2008-11-20 23:06:22 +0100 (Thu, 20 Nov 2008) | 1 line
backport r67300
........
r67307 | amaury.forgeotdarc | 2008-11-21 00:34:31 +0100 (Fri, 21 Nov 2008) | 9 lines
Fixed issue #4233.
Changed semantic of _fileio.FileIO's close() method on file objects with closefd=False.
The file descriptor is still kept open but the file object behaves like a closed file.
The FileIO object also got a new readonly attribute closefd.
Approved by Barry
Backport of r67106 from the py3k branch
........
r67330 | georg.brandl | 2008-11-22 09:34:14 +0100 (Sat, 22 Nov 2008) | 2 lines
#4364: fix attribute name on ctypes object.
........
r67332 | georg.brandl | 2008-11-22 09:45:33 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix typo.
........
r67336 | georg.brandl | 2008-11-22 11:08:50 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix error about "-*-" being mandatory in coding cookies.
........
r67355 | georg.brandl | 2008-11-23 20:17:25 +0100 (Sun, 23 Nov 2008) | 2 lines
#4392: fix parameter name.
........
r67359 | georg.brandl | 2008-11-23 22:57:30 +0100 (Sun, 23 Nov 2008) | 2 lines
#4399: fix typo.
........
r67362 | gregory.p.smith | 2008-11-24 01:41:43 +0100 (Mon, 24 Nov 2008) | 2 lines
Document PY_SSIZE_T_CLEAN for PyArg_ParseTuple.
........
r67364 | benjamin.peterson | 2008-11-24 02:16:29 +0100 (Mon, 24 Nov 2008) | 2 lines
replace reference to debugger-hooks
........
r67367 | georg.brandl | 2008-11-24 17:16:07 +0100 (Mon, 24 Nov 2008) | 2 lines
Fix typo.
........
r67368 | georg.brandl | 2008-11-24 20:56:47 +0100 (Mon, 24 Nov 2008) | 2 lines
#4404: make clear what "path" is.
........
r67370 | jeremy.hylton | 2008-11-24 23:00:29 +0100 (Mon, 24 Nov 2008) | 8 lines
Add unittests that verify documented behavior of public methods in Transport
class.
These methods can be overridden. The tests verify that the overridden
methods are called, and that changes to the connection have a visible
effect on the request.
........
2008-12-05 04:51:30 -04:00
|
|
|
self->fd = -1;
|
2008-01-25 08:18:43 -04:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
errno = internal_close(self);
|
|
|
|
if (errno < 0) {
|
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_new(PyTypeObject *type, PyObject *args, PyObject *kews)
|
|
|
|
{
|
|
|
|
PyFileIOObject *self;
|
|
|
|
|
|
|
|
assert(type != NULL && type->tp_alloc != NULL);
|
|
|
|
|
|
|
|
self = (PyFileIOObject *) type->tp_alloc(type, 0);
|
|
|
|
if (self != NULL) {
|
|
|
|
self->fd = -1;
|
2008-10-30 18:52:43 -03:00
|
|
|
self->readable = 0;
|
|
|
|
self->writable = 0;
|
|
|
|
self->seekable = -1;
|
|
|
|
self->closefd = 1;
|
2008-01-25 08:18:43 -04:00
|
|
|
self->weakreflist = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (PyObject *) self;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* On Unix, open will succeed for directories.
|
|
|
|
In Python, there should be no file objects referring to
|
|
|
|
directories, so we need a check. */
|
|
|
|
|
|
|
|
static int
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
dircheck(PyFileIOObject* self, char *name)
|
2008-01-25 08:18:43 -04:00
|
|
|
{
|
|
|
|
#if defined(HAVE_FSTAT) && defined(S_IFDIR) && defined(EISDIR)
|
|
|
|
struct stat buf;
|
|
|
|
if (self->fd < 0)
|
|
|
|
return 0;
|
|
|
|
if (fstat(self->fd, &buf) == 0 && S_ISDIR(buf.st_mode)) {
|
|
|
|
char *msg = strerror(EISDIR);
|
|
|
|
PyObject *exc;
|
|
|
|
internal_close(self);
|
|
|
|
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
exc = PyObject_CallFunction(PyExc_IOError, "(iss)",
|
|
|
|
EISDIR, msg, name);
|
2008-01-25 08:18:43 -04:00
|
|
|
PyErr_SetObject(PyExc_IOError, exc);
|
|
|
|
Py_XDECREF(exc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-01-19 11:59:36 -04:00
|
|
|
static int
|
|
|
|
check_fd(int fd)
|
|
|
|
{
|
|
|
|
#if defined(HAVE_FSTAT)
|
|
|
|
struct stat buf;
|
|
|
|
if (fstat(fd, &buf) < 0 && errno == EBADF) {
|
|
|
|
PyObject *exc;
|
|
|
|
char *msg = strerror(EBADF);
|
|
|
|
exc = PyObject_CallFunction(PyExc_OSError, "(is)",
|
|
|
|
EBADF, msg);
|
|
|
|
PyErr_SetObject(PyExc_OSError, exc);
|
|
|
|
Py_XDECREF(exc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-01-25 08:18:43 -04:00
|
|
|
|
|
|
|
static int
|
|
|
|
fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
|
|
|
PyFileIOObject *self = (PyFileIOObject *) oself;
|
|
|
|
static char *kwlist[] = {"file", "mode", "closefd", NULL};
|
|
|
|
char *name = NULL;
|
|
|
|
char *mode = "r";
|
|
|
|
char *s;
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
Py_UNICODE *widename = NULL;
|
|
|
|
#endif
|
|
|
|
int ret = 0;
|
|
|
|
int rwa = 0, plus = 0, append = 0;
|
|
|
|
int flags = 0;
|
|
|
|
int fd = -1;
|
|
|
|
int closefd = 1;
|
|
|
|
|
|
|
|
assert(PyFileIO_Check(oself));
|
|
|
|
if (self->fd >= 0) {
|
|
|
|
/* Have to close the existing file first. */
|
|
|
|
if (internal_close(self) < 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (PyArg_ParseTupleAndKeywords(args, kwds, "i|si:fileio",
|
|
|
|
kwlist, &fd, &mode, &closefd)) {
|
|
|
|
if (fd < 0) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Negative filedescriptor");
|
|
|
|
return -1;
|
|
|
|
}
|
2009-01-19 11:59:36 -04:00
|
|
|
if (check_fd(fd))
|
|
|
|
return -1;
|
2008-01-25 08:18:43 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyErr_Clear();
|
|
|
|
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
|
|
if (GetVersion() < 0x80000000) {
|
|
|
|
/* On NT, so wide API available */
|
|
|
|
PyObject *po;
|
|
|
|
if (PyArg_ParseTupleAndKeywords(args, kwds, "U|si:fileio",
|
|
|
|
kwlist, &po, &mode, &closefd)
|
|
|
|
) {
|
|
|
|
widename = PyUnicode_AS_UNICODE(po);
|
|
|
|
} else {
|
|
|
|
/* Drop the argument parsing error as narrow
|
|
|
|
strings are also valid. */
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (widename == NULL)
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "et|si:fileio",
|
|
|
|
kwlist,
|
|
|
|
Py_FileSystemDefaultEncoding,
|
|
|
|
&name, &mode, &closefd))
|
2008-08-24 19:03:05 -03:00
|
|
|
return -1;
|
2008-01-25 08:18:43 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
s = mode;
|
|
|
|
while (*s) {
|
|
|
|
switch (*s++) {
|
|
|
|
case 'r':
|
|
|
|
if (rwa) {
|
|
|
|
bad_mode:
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Must have exactly one of read/write/append mode");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
rwa = 1;
|
|
|
|
self->readable = 1;
|
|
|
|
break;
|
|
|
|
case 'w':
|
|
|
|
if (rwa)
|
|
|
|
goto bad_mode;
|
|
|
|
rwa = 1;
|
|
|
|
self->writable = 1;
|
|
|
|
flags |= O_CREAT | O_TRUNC;
|
|
|
|
break;
|
|
|
|
case 'a':
|
|
|
|
if (rwa)
|
|
|
|
goto bad_mode;
|
|
|
|
rwa = 1;
|
|
|
|
self->writable = 1;
|
|
|
|
flags |= O_CREAT;
|
|
|
|
append = 1;
|
|
|
|
break;
|
Merged revisions 67326,67498,67531-67532,67538,67553-67554,67556-67557 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67326 | benjamin.peterson | 2008-11-22 02:59:15 +0100 (Sat, 22 Nov 2008) | 1 line
backport r67325: make FileIO.mode always contain 'b'
........
r67498 | raymond.hettinger | 2008-12-03 16:42:10 +0100 (Wed, 03 Dec 2008) | 1 line
Backport r67478
........
r67531 | georg.brandl | 2008-12-04 19:54:05 +0100 (Thu, 04 Dec 2008) | 2 lines
Add reference to enumerate() to indices example.
........
r67532 | georg.brandl | 2008-12-04 19:59:16 +0100 (Thu, 04 Dec 2008) | 2 lines
Add another heapq example.
........
r67538 | georg.brandl | 2008-12-04 22:28:16 +0100 (Thu, 04 Dec 2008) | 2 lines
Clarification to avoid confusing output with file descriptors.
........
r67553 | georg.brandl | 2008-12-05 08:49:49 +0100 (Fri, 05 Dec 2008) | 2 lines
#4408: document regex.groups.
........
r67554 | georg.brandl | 2008-12-05 08:52:26 +0100 (Fri, 05 Dec 2008) | 2 lines
#4409: fix asterisks looking like footnotes.
........
r67556 | georg.brandl | 2008-12-05 09:02:17 +0100 (Fri, 05 Dec 2008) | 2 lines
#4441: improve doc for os.open() flags.
........
r67557 | georg.brandl | 2008-12-05 09:06:57 +0100 (Fri, 05 Dec 2008) | 2 lines
Add an index entry for "subclassing immutable types".
........
2008-12-05 05:08:28 -04:00
|
|
|
case 'b':
|
|
|
|
break;
|
2008-01-25 08:18:43 -04:00
|
|
|
case '+':
|
|
|
|
if (plus)
|
|
|
|
goto bad_mode;
|
|
|
|
self->readable = self->writable = 1;
|
|
|
|
plus = 1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"invalid mode: %.200s", mode);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!rwa)
|
|
|
|
goto bad_mode;
|
|
|
|
|
|
|
|
if (self->readable && self->writable)
|
|
|
|
flags |= O_RDWR;
|
|
|
|
else if (self->readable)
|
|
|
|
flags |= O_RDONLY;
|
|
|
|
else
|
|
|
|
flags |= O_WRONLY;
|
|
|
|
|
|
|
|
#ifdef O_BINARY
|
|
|
|
flags |= O_BINARY;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef O_APPEND
|
|
|
|
if (append)
|
|
|
|
flags |= O_APPEND;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (fd >= 0) {
|
|
|
|
self->fd = fd;
|
|
|
|
self->closefd = closefd;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
self->closefd = 1;
|
|
|
|
if (!closefd) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66801 | andrew.kuchling | 2008-10-04 23:51:59 +0200 (Sat, 04 Oct 2008) | 1 line
Punctuation fix; expand dict.update docstring to be clearer
................
r66803 | benjamin.peterson | 2008-10-05 00:15:31 +0200 (Sun, 05 Oct 2008) | 1 line
fix typo
................
r66804 | andrew.kuchling | 2008-10-05 02:11:56 +0200 (Sun, 05 Oct 2008) | 1 line
#1415508 from Rocky Bernstein: add docstrings for enable_interspersed_args(), disable_interspersed_args()
................
r66813 | andrew.kuchling | 2008-10-06 14:07:04 +0200 (Mon, 06 Oct 2008) | 3 lines
Per Greg Ward, optparse is no longer being externally maintained.
I'll look at the bugs in the Optik bug tracker and copy them to the Python bug
tracker if they're still relevant.
................
r66854 | georg.brandl | 2008-10-08 19:20:20 +0200 (Wed, 08 Oct 2008) | 2 lines
#4059: patch up some sqlite docs.
................
r66855 | georg.brandl | 2008-10-08 19:30:55 +0200 (Wed, 08 Oct 2008) | 2 lines
#4058: fix some whatsnew markup.
................
r66856 | georg.brandl | 2008-10-08 20:47:17 +0200 (Wed, 08 Oct 2008) | 3 lines
#3935: properly support list subclasses in the C impl. of bisect.
Patch reviewed by Raymond.
................
r66866 | benjamin.peterson | 2008-10-09 22:54:43 +0200 (Thu, 09 Oct 2008) | 1 line
update paragraph about __future__ for 2.6
................
r66870 | armin.rigo | 2008-10-10 10:40:44 +0200 (Fri, 10 Oct 2008) | 2 lines
Typo: "ThreadError" is the name in the C source.
................
r66871 | benjamin.peterson | 2008-10-10 22:38:49 +0200 (Fri, 10 Oct 2008) | 1 line
fix a small typo
................
r66872 | benjamin.peterson | 2008-10-10 22:51:37 +0200 (Fri, 10 Oct 2008) | 1 line
talk about how you can unzip with zip
................
r66874 | benjamin.peterson | 2008-10-11 00:23:41 +0200 (Sat, 11 Oct 2008) | 1 line
PyGILState_Acquire -> PyGILState_Ensure
................
r66887 | benjamin.peterson | 2008-10-13 23:51:40 +0200 (Mon, 13 Oct 2008) | 1 line
document how to disable fixers
................
r66903 | benjamin.peterson | 2008-10-15 22:34:09 +0200 (Wed, 15 Oct 2008) | 1 line
don't recurse into directories that start with '.'
................
r66905 | benjamin.peterson | 2008-10-15 23:05:55 +0200 (Wed, 15 Oct 2008) | 1 line
support the optional line argument for idle
................
r66911 | benjamin.peterson | 2008-10-16 01:10:28 +0200 (Thu, 16 Oct 2008) | 41 lines
Merged revisions 66805,66841,66860,66884-66886,66893,66907,66910 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66805 | benjamin.peterson | 2008-10-04 20:11:02 -0500 (Sat, 04 Oct 2008) | 1 line
mention what the fixes directory is for
........
r66841 | benjamin.peterson | 2008-10-07 17:48:12 -0500 (Tue, 07 Oct 2008) | 1 line
use assertFalse and assertTrue
........
r66860 | benjamin.peterson | 2008-10-08 16:05:07 -0500 (Wed, 08 Oct 2008) | 1 line
instead of abusing the pattern matcher, use start_tree to find a next binding
........
r66884 | benjamin.peterson | 2008-10-13 15:50:30 -0500 (Mon, 13 Oct 2008) | 1 line
don't print tokens to stdout when -v is given
........
r66885 | benjamin.peterson | 2008-10-13 16:28:57 -0500 (Mon, 13 Oct 2008) | 1 line
add the -x option to disable fixers
........
r66886 | benjamin.peterson | 2008-10-13 16:33:53 -0500 (Mon, 13 Oct 2008) | 1 line
cut down on some crud
........
r66893 | benjamin.peterson | 2008-10-14 17:16:54 -0500 (Tue, 14 Oct 2008) | 1 line
add an optional set literal fixer
........
r66907 | benjamin.peterson | 2008-10-15 16:59:41 -0500 (Wed, 15 Oct 2008) | 1 line
don't write backup files by default
........
r66910 | benjamin.peterson | 2008-10-15 17:43:10 -0500 (Wed, 15 Oct 2008) | 1 line
add the -n option; it stops backupfiles from being written
........
................
r66913 | benjamin.peterson | 2008-10-16 20:52:14 +0200 (Thu, 16 Oct 2008) | 1 line
document that deque indexing is O(n) #4123
................
r66927 | andrew.kuchling | 2008-10-16 22:15:47 +0200 (Thu, 16 Oct 2008) | 1 line
Fix wording (2.6.1 backport candidate)
................
r66932 | benjamin.peterson | 2008-10-16 23:09:28 +0200 (Thu, 16 Oct 2008) | 1 line
check for error conditions in _json #3623
................
r66938 | benjamin.peterson | 2008-10-16 23:27:54 +0200 (Thu, 16 Oct 2008) | 1 line
fix possible ref leak
................
r66942 | benjamin.peterson | 2008-10-16 23:48:06 +0200 (Thu, 16 Oct 2008) | 1 line
fix more possible ref leaks in _json and use Py_CLEAR
................
r66962 | benjamin.peterson | 2008-10-17 22:01:01 +0200 (Fri, 17 Oct 2008) | 1 line
clarify CALL_FUNCTION #4141
................
r66964 | georg.brandl | 2008-10-17 23:41:49 +0200 (Fri, 17 Oct 2008) | 2 lines
Fix duplicate word.
................
r66973 | armin.ronacher | 2008-10-19 10:27:43 +0200 (Sun, 19 Oct 2008) | 3 lines
Fixed #4067 by implementing _attributes and _fields for the AST root node.
................
r66974 | benjamin.peterson | 2008-10-19 15:59:01 +0200 (Sun, 19 Oct 2008) | 1 line
fix compiler warning
................
r66977 | benjamin.peterson | 2008-10-19 21:39:16 +0200 (Sun, 19 Oct 2008) | 1 line
mention -n
................
r66992 | benjamin.peterson | 2008-10-21 22:51:13 +0200 (Tue, 21 Oct 2008) | 1 line
make sure to call iteritems()
................
r66998 | benjamin.peterson | 2008-10-22 22:57:43 +0200 (Wed, 22 Oct 2008) | 1 line
fix a few typos
................
r66999 | benjamin.peterson | 2008-10-22 23:05:30 +0200 (Wed, 22 Oct 2008) | 1 line
and another typo...
................
r67002 | hirokazu.yamamoto | 2008-10-23 02:37:33 +0200 (Thu, 23 Oct 2008) | 1 line
Issue #4183: Some tests didn't run with pickle.HIGHEST_PROTOCOL.
................
r67005 | walter.doerwald | 2008-10-23 15:11:39 +0200 (Thu, 23 Oct 2008) | 2 lines
Use the correct names of the stateless codec functions (Fixes issue 4178).
................
r67007 | benjamin.peterson | 2008-10-23 23:43:48 +0200 (Thu, 23 Oct 2008) | 1 line
only nonempty __slots__ don't work
................
r67028 | benjamin.peterson | 2008-10-26 01:27:07 +0200 (Sun, 26 Oct 2008) | 1 line
don't use a catch-all
................
r67040 | armin.rigo | 2008-10-28 18:01:21 +0100 (Tue, 28 Oct 2008) | 5 lines
Fix one of the tests: it relied on being present in an "output test" in
order to actually test what it was supposed to test, i.e. that the code
in the __del__ method did not crash. Use instead the new helper
test_support.captured_output().
................
r67041 | benjamin.peterson | 2008-10-29 21:33:00 +0100 (Wed, 29 Oct 2008) | 1 line
mention the version gettempdir() was added
................
r67044 | amaury.forgeotdarc | 2008-10-30 00:15:57 +0100 (Thu, 30 Oct 2008) | 3 lines
Correct error message in io.open():
closefd=True is the only accepted value with a file name.
................
r67070 | benjamin.peterson | 2008-10-31 21:41:44 +0100 (Fri, 31 Oct 2008) | 1 line
rephrase has_key doc
................
r67089 | benjamin.peterson | 2008-11-03 21:43:20 +0100 (Mon, 03 Nov 2008) | 1 line
clarify by splitting into multiple paragraphs
................
r67091 | benjamin.peterson | 2008-11-03 23:34:57 +0100 (Mon, 03 Nov 2008) | 1 line
move a FileIO test to test_fileio
................
r67101 | georg.brandl | 2008-11-04 21:49:35 +0100 (Tue, 04 Nov 2008) | 2 lines
#4167: fix markup glitches.
................
r67117 | georg.brandl | 2008-11-06 11:17:58 +0100 (Thu, 06 Nov 2008) | 2 lines
#4268: Use correct module for two toplevel functions.
................
r67118 | georg.brandl | 2008-11-06 11:19:11 +0100 (Thu, 06 Nov 2008) | 2 lines
#4267: small fixes in sqlite3 docs.
................
r67119 | georg.brandl | 2008-11-06 11:20:49 +0100 (Thu, 06 Nov 2008) | 2 lines
#4245: move Thread section to the top.
................
r67123 | georg.brandl | 2008-11-06 19:49:15 +0100 (Thu, 06 Nov 2008) | 2 lines
#4247: add "pass" examples to tutorial.
................
r67124 | andrew.kuchling | 2008-11-06 20:23:02 +0100 (Thu, 06 Nov 2008) | 1 line
Fix grammar error; reword two paragraphs
................
2008-11-07 04:56:27 -04:00
|
|
|
"Cannot use closefd=False with file name");
|
2008-01-25 08:18:43 -04:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
if (widename != NULL)
|
|
|
|
self->fd = _wopen(widename, flags, 0666);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
self->fd = open(name, flags, 0666);
|
|
|
|
Py_END_ALLOW_THREADS
|
2008-09-01 11:13:43 -03:00
|
|
|
if (self->fd < 0) {
|
2008-01-25 08:18:43 -04:00
|
|
|
#ifdef MS_WINDOWS
|
Merged revisions 68133-68134,68141-68142,68145-68146,68148-68149,68159-68162,68166,68171-68174,68179,68195-68196,68210,68214-68215,68217-68222 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68133 | antoine.pitrou | 2009-01-01 16:38:03 +0100 (Thu, 01 Jan 2009) | 1 line
fill in actual issue number in tests
........
r68134 | hirokazu.yamamoto | 2009-01-01 16:45:39 +0100 (Thu, 01 Jan 2009) | 2 lines
Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
file with `str' filename on Windows.
........
r68141 | benjamin.peterson | 2009-01-01 17:43:12 +0100 (Thu, 01 Jan 2009) | 1 line
fix highlighting
........
r68142 | benjamin.peterson | 2009-01-01 18:29:49 +0100 (Thu, 01 Jan 2009) | 2 lines
welcome to 2009, Python!
........
r68145 | amaury.forgeotdarc | 2009-01-02 01:03:54 +0100 (Fri, 02 Jan 2009) | 5 lines
#4801 _collections module fails to build on cygwin.
_PyObject_GC_TRACK is the macro version of PyObject_GC_Track,
and according to documentation it should not be used for extension modules.
........
r68146 | ronald.oussoren | 2009-01-02 11:44:46 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4472: "configure --enable-shared doesn't work on OSX"
........
r68148 | ronald.oussoren | 2009-01-02 11:48:31 +0100 (Fri, 02 Jan 2009) | 2 lines
Forgot to add a NEWS item in my previous checkin
........
r68149 | ronald.oussoren | 2009-01-02 11:50:48 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4780
........
r68159 | ronald.oussoren | 2009-01-02 15:48:17 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue 1627952
........
r68160 | ronald.oussoren | 2009-01-02 15:52:09 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue r1737832
........
r68161 | ronald.oussoren | 2009-01-02 16:00:05 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 1149804
........
r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 4472 is incompatible with Cygwin, this patch
should fix that.
........
r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line
document PyMemberDef
........
r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines
#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
........
r68172 | martin.v.loewis | 2009-01-02 21:32:55 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4075: Use OutputDebugStringW in Py_FatalError.
........
r68173 | martin.v.loewis | 2009-01-02 21:40:14 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4051: Prevent conflict of UNICODE macros in cPickle.
........
r68174 | benjamin.peterson | 2009-01-02 21:47:27 +0100 (Fri, 02 Jan 2009) | 1 line
fix compilation on non-Windows platforms
........
r68179 | raymond.hettinger | 2009-01-02 22:26:45 +0100 (Fri, 02 Jan 2009) | 1 line
Issue #4615. Document how to use itertools for de-duping.
........
r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove useless string literal.
........
r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix indentation.
........
r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines
Set eol-style correctly for mp_distributing.py.
........
r68214 | georg.brandl | 2009-01-03 20:44:48 +0100 (Sat, 03 Jan 2009) | 2 lines
Make indentation consistent.
........
r68215 | georg.brandl | 2009-01-03 21:15:14 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix role name.
........
r68217 | georg.brandl | 2009-01-03 21:30:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Add rstlint, a little tool to find subtle markup problems and inconsistencies in the Doc sources.
........
r68218 | georg.brandl | 2009-01-03 21:38:59 +0100 (Sat, 03 Jan 2009) | 2 lines
Recognize usage of the default role.
........
r68219 | georg.brandl | 2009-01-03 21:47:01 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix uses of the default role.
........
r68220 | georg.brandl | 2009-01-03 21:55:06 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove trailing whitespace.
........
r68221 | georg.brandl | 2009-01-03 22:04:55 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove tabs from the documentation.
........
r68222 | georg.brandl | 2009-01-03 22:11:58 +0100 (Sat, 03 Jan 2009) | 2 lines
Disable the line length checker by default.
........
2009-01-03 17:55:17 -04:00
|
|
|
if (widename != NULL)
|
|
|
|
PyErr_SetFromErrnoWithUnicodeFilename(PyExc_IOError, widename);
|
|
|
|
else
|
2008-01-25 08:18:43 -04:00
|
|
|
#endif
|
Merged revisions 68133-68134,68141-68142,68145-68146,68148-68149,68159-68162,68166,68171-68174,68179,68195-68196,68210,68214-68215,68217-68222 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68133 | antoine.pitrou | 2009-01-01 16:38:03 +0100 (Thu, 01 Jan 2009) | 1 line
fill in actual issue number in tests
........
r68134 | hirokazu.yamamoto | 2009-01-01 16:45:39 +0100 (Thu, 01 Jan 2009) | 2 lines
Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
file with `str' filename on Windows.
........
r68141 | benjamin.peterson | 2009-01-01 17:43:12 +0100 (Thu, 01 Jan 2009) | 1 line
fix highlighting
........
r68142 | benjamin.peterson | 2009-01-01 18:29:49 +0100 (Thu, 01 Jan 2009) | 2 lines
welcome to 2009, Python!
........
r68145 | amaury.forgeotdarc | 2009-01-02 01:03:54 +0100 (Fri, 02 Jan 2009) | 5 lines
#4801 _collections module fails to build on cygwin.
_PyObject_GC_TRACK is the macro version of PyObject_GC_Track,
and according to documentation it should not be used for extension modules.
........
r68146 | ronald.oussoren | 2009-01-02 11:44:46 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4472: "configure --enable-shared doesn't work on OSX"
........
r68148 | ronald.oussoren | 2009-01-02 11:48:31 +0100 (Fri, 02 Jan 2009) | 2 lines
Forgot to add a NEWS item in my previous checkin
........
r68149 | ronald.oussoren | 2009-01-02 11:50:48 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4780
........
r68159 | ronald.oussoren | 2009-01-02 15:48:17 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue 1627952
........
r68160 | ronald.oussoren | 2009-01-02 15:52:09 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue r1737832
........
r68161 | ronald.oussoren | 2009-01-02 16:00:05 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 1149804
........
r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 4472 is incompatible with Cygwin, this patch
should fix that.
........
r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line
document PyMemberDef
........
r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines
#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
........
r68172 | martin.v.loewis | 2009-01-02 21:32:55 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4075: Use OutputDebugStringW in Py_FatalError.
........
r68173 | martin.v.loewis | 2009-01-02 21:40:14 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4051: Prevent conflict of UNICODE macros in cPickle.
........
r68174 | benjamin.peterson | 2009-01-02 21:47:27 +0100 (Fri, 02 Jan 2009) | 1 line
fix compilation on non-Windows platforms
........
r68179 | raymond.hettinger | 2009-01-02 22:26:45 +0100 (Fri, 02 Jan 2009) | 1 line
Issue #4615. Document how to use itertools for de-duping.
........
r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove useless string literal.
........
r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix indentation.
........
r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines
Set eol-style correctly for mp_distributing.py.
........
r68214 | georg.brandl | 2009-01-03 20:44:48 +0100 (Sat, 03 Jan 2009) | 2 lines
Make indentation consistent.
........
r68215 | georg.brandl | 2009-01-03 21:15:14 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix role name.
........
r68217 | georg.brandl | 2009-01-03 21:30:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Add rstlint, a little tool to find subtle markup problems and inconsistencies in the Doc sources.
........
r68218 | georg.brandl | 2009-01-03 21:38:59 +0100 (Sat, 03 Jan 2009) | 2 lines
Recognize usage of the default role.
........
r68219 | georg.brandl | 2009-01-03 21:47:01 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix uses of the default role.
........
r68220 | georg.brandl | 2009-01-03 21:55:06 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove trailing whitespace.
........
r68221 | georg.brandl | 2009-01-03 22:04:55 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove tabs from the documentation.
........
r68222 | georg.brandl | 2009-01-03 22:11:58 +0100 (Sat, 03 Jan 2009) | 2 lines
Disable the line length checker by default.
........
2009-01-03 17:55:17 -04:00
|
|
|
PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
|
2008-01-25 08:18:43 -04:00
|
|
|
goto error;
|
|
|
|
}
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
if(dircheck(self, name) < 0)
|
2008-09-01 11:13:43 -03:00
|
|
|
goto error;
|
2008-01-25 08:18:43 -04:00
|
|
|
}
|
|
|
|
|
2009-01-20 20:56:37 -04:00
|
|
|
if (append) {
|
|
|
|
/* For consistent behaviour, we explicitly seek to the
|
|
|
|
end of file (otherwise, it might be done only on the
|
|
|
|
first write()). */
|
|
|
|
PyObject *pos = portable_lseek(self->fd, NULL, 2);
|
|
|
|
if (pos == NULL)
|
|
|
|
goto error;
|
|
|
|
Py_DECREF(pos);
|
|
|
|
}
|
|
|
|
|
2008-01-25 08:18:43 -04:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
error:
|
|
|
|
ret = -1;
|
|
|
|
|
|
|
|
done:
|
2008-08-24 02:04:52 -03:00
|
|
|
PyMem_Free(name);
|
2008-01-25 08:18:43 -04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
fileio_dealloc(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->weakreflist != NULL)
|
|
|
|
PyObject_ClearWeakRefs((PyObject *) self);
|
|
|
|
|
|
|
|
if (self->fd >= 0 && self->closefd) {
|
|
|
|
errno = internal_close(self);
|
|
|
|
if (errno < 0) {
|
|
|
|
PySys_WriteStderr("close failed: [Errno %d] %s\n",
|
|
|
|
errno, strerror(errno));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_TYPE(self)->tp_free((PyObject *)self);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
err_closed(void)
|
|
|
|
{
|
|
|
|
PyErr_SetString(PyExc_ValueError, "I/O operation on closed file");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
err_mode(char *action)
|
|
|
|
{
|
|
|
|
PyErr_Format(PyExc_ValueError, "File not open for %s", action);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_fileno(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
return PyInt_FromLong((long) self->fd);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_readable(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
return PyBool_FromLong((long) self->readable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_writable(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
return PyBool_FromLong((long) self->writable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_seekable(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
if (self->seekable < 0) {
|
|
|
|
int ret;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
ret = lseek(self->fd, 0, SEEK_CUR);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (ret < 0)
|
|
|
|
self->seekable = 0;
|
|
|
|
else
|
|
|
|
self->seekable = 1;
|
|
|
|
}
|
|
|
|
return PyBool_FromLong((long) self->seekable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_readinto(PyFileIOObject *self, PyObject *args)
|
|
|
|
{
|
2008-08-12 11:49:50 -03:00
|
|
|
Py_buffer pbuf;
|
2008-01-25 08:18:43 -04:00
|
|
|
Py_ssize_t n;
|
|
|
|
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
if (!self->readable)
|
|
|
|
return err_mode("reading");
|
|
|
|
|
2008-08-12 11:49:50 -03:00
|
|
|
if (!PyArg_ParseTuple(args, "w*", &pbuf))
|
2008-01-25 08:18:43 -04:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
2008-08-12 11:49:50 -03:00
|
|
|
n = read(self->fd, pbuf.buf, pbuf.len);
|
2008-01-25 08:18:43 -04:00
|
|
|
Py_END_ALLOW_THREADS
|
2008-08-12 11:49:50 -03:00
|
|
|
PyBuffer_Release(&pbuf);
|
2008-01-25 08:18:43 -04:00
|
|
|
if (n < 0) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return PyLong_FromSsize_t(n);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define DEFAULT_BUFFER_SIZE (8*1024)
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_readall(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
PyObject *result;
|
|
|
|
Py_ssize_t total = 0;
|
|
|
|
int n;
|
|
|
|
|
2008-06-09 01:58:54 -03:00
|
|
|
result = PyString_FromStringAndSize(NULL, DEFAULT_BUFFER_SIZE);
|
2008-01-25 08:18:43 -04:00
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
Py_ssize_t newsize = total + DEFAULT_BUFFER_SIZE;
|
2008-06-09 01:58:54 -03:00
|
|
|
if (PyString_GET_SIZE(result) < newsize) {
|
|
|
|
if (_PyString_Resize(&result, newsize) < 0) {
|
2008-01-25 08:18:43 -04:00
|
|
|
if (total == 0) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyErr_Clear();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
|
|
|
n = read(self->fd,
|
2008-06-09 01:58:54 -03:00
|
|
|
PyString_AS_STRING(result) + total,
|
2008-01-25 08:18:43 -04:00
|
|
|
newsize - total);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (n == 0)
|
|
|
|
break;
|
|
|
|
if (n < 0) {
|
|
|
|
if (total > 0)
|
|
|
|
break;
|
|
|
|
if (errno == EAGAIN) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
Py_DECREF(result);
|
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
total += n;
|
|
|
|
}
|
|
|
|
|
2008-06-09 01:58:54 -03:00
|
|
|
if (PyString_GET_SIZE(result) > total) {
|
|
|
|
if (_PyString_Resize(&result, total) < 0) {
|
2008-01-25 08:18:43 -04:00
|
|
|
/* This should never happen, but just in case */
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_read(PyFileIOObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
char *ptr;
|
|
|
|
Py_ssize_t n;
|
|
|
|
Py_ssize_t size = -1;
|
|
|
|
PyObject *bytes;
|
|
|
|
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
if (!self->readable)
|
|
|
|
return err_mode("reading");
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "|n", &size))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (size < 0) {
|
|
|
|
return fileio_readall(self);
|
|
|
|
}
|
|
|
|
|
2008-06-09 01:58:54 -03:00
|
|
|
bytes = PyString_FromStringAndSize(NULL, size);
|
2008-01-25 08:18:43 -04:00
|
|
|
if (bytes == NULL)
|
|
|
|
return NULL;
|
2008-06-09 01:58:54 -03:00
|
|
|
ptr = PyString_AS_STRING(bytes);
|
2008-01-25 08:18:43 -04:00
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
|
|
|
n = read(self->fd, ptr, size);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
|
|
|
|
if (n < 0) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (n != size) {
|
2008-06-09 01:58:54 -03:00
|
|
|
if (_PyString_Resize(&bytes, n) < 0) {
|
2008-01-25 08:18:43 -04:00
|
|
|
Py_DECREF(bytes);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return (PyObject *) bytes;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_write(PyFileIOObject *self, PyObject *args)
|
|
|
|
{
|
2008-08-12 11:49:50 -03:00
|
|
|
Py_buffer pbuf;
|
2008-01-25 08:18:43 -04:00
|
|
|
Py_ssize_t n;
|
|
|
|
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
if (!self->writable)
|
|
|
|
return err_mode("writing");
|
|
|
|
|
2008-08-12 11:49:50 -03:00
|
|
|
if (!PyArg_ParseTuple(args, "s*", &pbuf))
|
2008-01-25 08:18:43 -04:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
2008-08-12 11:49:50 -03:00
|
|
|
n = write(self->fd, pbuf.buf, pbuf.len);
|
2008-01-25 08:18:43 -04:00
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
|
2008-08-12 11:49:50 -03:00
|
|
|
PyBuffer_Release(&pbuf);
|
|
|
|
|
2008-01-25 08:18:43 -04:00
|
|
|
if (n < 0) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return PyLong_FromSsize_t(n);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX Windows support below is likely incomplete */
|
|
|
|
|
|
|
|
#if defined(MS_WIN64) || defined(MS_WINDOWS)
|
|
|
|
typedef PY_LONG_LONG Py_off_t;
|
|
|
|
#else
|
|
|
|
typedef off_t Py_off_t;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Cribbed from posix_lseek() */
|
|
|
|
static PyObject *
|
|
|
|
portable_lseek(int fd, PyObject *posobj, int whence)
|
|
|
|
{
|
|
|
|
Py_off_t pos, res;
|
|
|
|
|
|
|
|
#ifdef SEEK_SET
|
|
|
|
/* Turn 0, 1, 2 into SEEK_{SET,CUR,END} */
|
|
|
|
switch (whence) {
|
|
|
|
#if SEEK_SET != 0
|
|
|
|
case 0: whence = SEEK_SET; break;
|
|
|
|
#endif
|
|
|
|
#if SEEK_CUR != 1
|
|
|
|
case 1: whence = SEEK_CUR; break;
|
|
|
|
#endif
|
|
|
|
#if SEEL_END != 2
|
|
|
|
case 2: whence = SEEK_END; break;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif /* SEEK_SET */
|
|
|
|
|
|
|
|
if (posobj == NULL)
|
|
|
|
pos = 0;
|
|
|
|
else {
|
|
|
|
if(PyFloat_Check(posobj)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
|
|
return NULL;
|
|
|
|
}
|
Backport fast alternate io.BytesIO implementation.
Merged r62778, r62779, r62802, r62806, r62807, r62808, r62809, r62844,
r62846, r62952, r62956.
2008-05-09 18:49:43 -03:00
|
|
|
#if defined(HAVE_LARGEFILE_SUPPORT)
|
|
|
|
pos = PyLong_AsLongLong(posobj);
|
2008-01-25 08:18:43 -04:00
|
|
|
#else
|
Backport fast alternate io.BytesIO implementation.
Merged r62778, r62779, r62802, r62806, r62807, r62808, r62809, r62844,
r62846, r62952, r62956.
2008-05-09 18:49:43 -03:00
|
|
|
pos = PyLong_AsLong(posobj);
|
2008-01-25 08:18:43 -04:00
|
|
|
#endif
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
#if defined(MS_WIN64) || defined(MS_WINDOWS)
|
|
|
|
res = _lseeki64(fd, pos, whence);
|
|
|
|
#else
|
|
|
|
res = lseek(fd, pos, whence);
|
|
|
|
#endif
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (res < 0)
|
|
|
|
return PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
|
Backport fast alternate io.BytesIO implementation.
Merged r62778, r62779, r62802, r62806, r62807, r62808, r62809, r62844,
r62846, r62952, r62956.
2008-05-09 18:49:43 -03:00
|
|
|
#if defined(HAVE_LARGEFILE_SUPPORT)
|
2008-01-25 08:18:43 -04:00
|
|
|
return PyLong_FromLongLong(res);
|
Backport fast alternate io.BytesIO implementation.
Merged r62778, r62779, r62802, r62806, r62807, r62808, r62809, r62844,
r62846, r62952, r62956.
2008-05-09 18:49:43 -03:00
|
|
|
#else
|
|
|
|
return PyLong_FromLong(res);
|
2008-01-25 08:18:43 -04:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_seek(PyFileIOObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
PyObject *posobj;
|
|
|
|
int whence = 0;
|
|
|
|
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "O|i", &posobj, &whence))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return portable_lseek(self->fd, posobj, whence);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_tell(PyFileIOObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
|
|
|
|
return portable_lseek(self->fd, NULL, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef HAVE_FTRUNCATE
|
|
|
|
static PyObject *
|
|
|
|
fileio_truncate(PyFileIOObject *self, PyObject *args)
|
|
|
|
{
|
2010-01-27 17:48:46 -04:00
|
|
|
PyObject *posobj = NULL; /* the new size wanted by the user */
|
|
|
|
#ifndef MS_WINDOWS
|
2008-01-25 08:18:43 -04:00
|
|
|
Py_off_t pos;
|
2010-01-27 17:48:46 -04:00
|
|
|
#endif
|
2008-01-25 08:18:43 -04:00
|
|
|
int ret;
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
fd = self->fd;
|
|
|
|
if (fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
if (!self->writable)
|
|
|
|
return err_mode("writing");
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "|O", &posobj))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (posobj == Py_None || posobj == NULL) {
|
Backport fast alternate io.BytesIO implementation.
Merged r62778, r62779, r62802, r62806, r62807, r62808, r62809, r62844,
r62846, r62952, r62956.
2008-05-09 18:49:43 -03:00
|
|
|
/* Get the current position. */
|
2010-01-27 17:48:46 -04:00
|
|
|
posobj = portable_lseek(fd, NULL, 1);
|
|
|
|
if (posobj == NULL)
|
Backport fast alternate io.BytesIO implementation.
Merged r62778, r62779, r62802, r62806, r62807, r62808, r62809, r62844,
r62846, r62952, r62956.
2008-05-09 18:49:43 -03:00
|
|
|
return NULL;
|
2010-01-27 17:48:46 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_INCREF(posobj);
|
|
|
|
}
|
2008-01-25 08:18:43 -04:00
|
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
/* MS _chsize doesn't work if newsize doesn't fit in 32 bits,
|
|
|
|
so don't even try using it. */
|
|
|
|
{
|
2010-01-27 17:48:46 -04:00
|
|
|
PyObject *oldposobj, *tempposobj;
|
2008-01-25 08:18:43 -04:00
|
|
|
HANDLE hFile;
|
2010-01-27 17:48:46 -04:00
|
|
|
|
|
|
|
/* we save the file pointer position */
|
|
|
|
oldposobj = portable_lseek(fd, NULL, 1);
|
|
|
|
if (oldposobj == NULL) {
|
|
|
|
Py_DECREF(posobj);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we then move to the truncation position */
|
|
|
|
tempposobj = portable_lseek(fd, posobj, 0);
|
|
|
|
if (tempposobj == NULL) {
|
|
|
|
Py_DECREF(oldposobj);
|
|
|
|
Py_DECREF(posobj);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_DECREF(tempposobj);
|
2008-01-25 08:18:43 -04:00
|
|
|
|
|
|
|
/* Truncate. Note that this may grow the file! */
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
|
|
|
hFile = (HANDLE)_get_osfhandle(fd);
|
2010-01-27 17:48:46 -04:00
|
|
|
ret = hFile == (HANDLE)-1; /* testing for INVALID_HANDLE value */
|
2008-01-25 08:18:43 -04:00
|
|
|
if (ret == 0) {
|
|
|
|
ret = SetEndOfFile(hFile) == 0;
|
|
|
|
if (ret)
|
|
|
|
errno = EACCES;
|
|
|
|
}
|
|
|
|
Py_END_ALLOW_THREADS
|
2010-01-27 17:48:46 -04:00
|
|
|
|
|
|
|
/* we restore the file pointer position in any case */
|
|
|
|
tempposobj = portable_lseek(fd, oldposobj, 0);
|
|
|
|
Py_DECREF(oldposobj);
|
|
|
|
if (tempposobj == NULL) {
|
|
|
|
Py_DECREF(posobj);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_DECREF(tempposobj);
|
2008-01-25 08:18:43 -04:00
|
|
|
}
|
|
|
|
#else
|
2010-01-27 17:48:46 -04:00
|
|
|
|
|
|
|
#if defined(HAVE_LARGEFILE_SUPPORT)
|
|
|
|
pos = PyLong_AsLongLong(posobj);
|
|
|
|
#else
|
|
|
|
pos = PyLong_AsLong(posobj);
|
|
|
|
#endif
|
|
|
|
if (PyErr_Occurred()){
|
|
|
|
Py_DECREF(posobj);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-01-25 08:18:43 -04:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
|
|
|
ret = ftruncate(fd, pos);
|
|
|
|
Py_END_ALLOW_THREADS
|
2010-01-27 17:48:46 -04:00
|
|
|
|
2008-01-25 08:18:43 -04:00
|
|
|
#endif /* !MS_WINDOWS */
|
|
|
|
|
|
|
|
if (ret != 0) {
|
2010-01-27 17:48:46 -04:00
|
|
|
Py_DECREF(posobj);
|
2008-01-25 08:18:43 -04:00
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return posobj;
|
|
|
|
}
|
2010-01-27 17:48:46 -04:00
|
|
|
#endif /* HAVE_FTRUNCATE */
|
2008-01-25 08:18:43 -04:00
|
|
|
|
|
|
|
static char *
|
|
|
|
mode_string(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->readable) {
|
|
|
|
if (self->writable)
|
Merged revisions 67326,67498,67531-67532,67538,67553-67554,67556-67557 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67326 | benjamin.peterson | 2008-11-22 02:59:15 +0100 (Sat, 22 Nov 2008) | 1 line
backport r67325: make FileIO.mode always contain 'b'
........
r67498 | raymond.hettinger | 2008-12-03 16:42:10 +0100 (Wed, 03 Dec 2008) | 1 line
Backport r67478
........
r67531 | georg.brandl | 2008-12-04 19:54:05 +0100 (Thu, 04 Dec 2008) | 2 lines
Add reference to enumerate() to indices example.
........
r67532 | georg.brandl | 2008-12-04 19:59:16 +0100 (Thu, 04 Dec 2008) | 2 lines
Add another heapq example.
........
r67538 | georg.brandl | 2008-12-04 22:28:16 +0100 (Thu, 04 Dec 2008) | 2 lines
Clarification to avoid confusing output with file descriptors.
........
r67553 | georg.brandl | 2008-12-05 08:49:49 +0100 (Fri, 05 Dec 2008) | 2 lines
#4408: document regex.groups.
........
r67554 | georg.brandl | 2008-12-05 08:52:26 +0100 (Fri, 05 Dec 2008) | 2 lines
#4409: fix asterisks looking like footnotes.
........
r67556 | georg.brandl | 2008-12-05 09:02:17 +0100 (Fri, 05 Dec 2008) | 2 lines
#4441: improve doc for os.open() flags.
........
r67557 | georg.brandl | 2008-12-05 09:06:57 +0100 (Fri, 05 Dec 2008) | 2 lines
Add an index entry for "subclassing immutable types".
........
2008-12-05 05:08:28 -04:00
|
|
|
return "rb+";
|
2008-01-25 08:18:43 -04:00
|
|
|
else
|
Merged revisions 67326,67498,67531-67532,67538,67553-67554,67556-67557 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67326 | benjamin.peterson | 2008-11-22 02:59:15 +0100 (Sat, 22 Nov 2008) | 1 line
backport r67325: make FileIO.mode always contain 'b'
........
r67498 | raymond.hettinger | 2008-12-03 16:42:10 +0100 (Wed, 03 Dec 2008) | 1 line
Backport r67478
........
r67531 | georg.brandl | 2008-12-04 19:54:05 +0100 (Thu, 04 Dec 2008) | 2 lines
Add reference to enumerate() to indices example.
........
r67532 | georg.brandl | 2008-12-04 19:59:16 +0100 (Thu, 04 Dec 2008) | 2 lines
Add another heapq example.
........
r67538 | georg.brandl | 2008-12-04 22:28:16 +0100 (Thu, 04 Dec 2008) | 2 lines
Clarification to avoid confusing output with file descriptors.
........
r67553 | georg.brandl | 2008-12-05 08:49:49 +0100 (Fri, 05 Dec 2008) | 2 lines
#4408: document regex.groups.
........
r67554 | georg.brandl | 2008-12-05 08:52:26 +0100 (Fri, 05 Dec 2008) | 2 lines
#4409: fix asterisks looking like footnotes.
........
r67556 | georg.brandl | 2008-12-05 09:02:17 +0100 (Fri, 05 Dec 2008) | 2 lines
#4441: improve doc for os.open() flags.
........
r67557 | georg.brandl | 2008-12-05 09:06:57 +0100 (Fri, 05 Dec 2008) | 2 lines
Add an index entry for "subclassing immutable types".
........
2008-12-05 05:08:28 -04:00
|
|
|
return "rb";
|
2008-01-25 08:18:43 -04:00
|
|
|
}
|
|
|
|
else
|
Merged revisions 67326,67498,67531-67532,67538,67553-67554,67556-67557 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67326 | benjamin.peterson | 2008-11-22 02:59:15 +0100 (Sat, 22 Nov 2008) | 1 line
backport r67325: make FileIO.mode always contain 'b'
........
r67498 | raymond.hettinger | 2008-12-03 16:42:10 +0100 (Wed, 03 Dec 2008) | 1 line
Backport r67478
........
r67531 | georg.brandl | 2008-12-04 19:54:05 +0100 (Thu, 04 Dec 2008) | 2 lines
Add reference to enumerate() to indices example.
........
r67532 | georg.brandl | 2008-12-04 19:59:16 +0100 (Thu, 04 Dec 2008) | 2 lines
Add another heapq example.
........
r67538 | georg.brandl | 2008-12-04 22:28:16 +0100 (Thu, 04 Dec 2008) | 2 lines
Clarification to avoid confusing output with file descriptors.
........
r67553 | georg.brandl | 2008-12-05 08:49:49 +0100 (Fri, 05 Dec 2008) | 2 lines
#4408: document regex.groups.
........
r67554 | georg.brandl | 2008-12-05 08:52:26 +0100 (Fri, 05 Dec 2008) | 2 lines
#4409: fix asterisks looking like footnotes.
........
r67556 | georg.brandl | 2008-12-05 09:02:17 +0100 (Fri, 05 Dec 2008) | 2 lines
#4441: improve doc for os.open() flags.
........
r67557 | georg.brandl | 2008-12-05 09:06:57 +0100 (Fri, 05 Dec 2008) | 2 lines
Add an index entry for "subclassing immutable types".
........
2008-12-05 05:08:28 -04:00
|
|
|
return "wb";
|
2008-01-25 08:18:43 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_repr(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
2008-06-09 01:58:54 -03:00
|
|
|
return PyString_FromFormat("_fileio._FileIO(-1)");
|
2008-01-25 08:18:43 -04:00
|
|
|
|
2008-06-09 01:58:54 -03:00
|
|
|
return PyString_FromFormat("_fileio._FileIO(%d, '%s')",
|
2008-01-25 08:18:43 -04:00
|
|
|
self->fd, mode_string(self));
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_isatty(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
long res;
|
|
|
|
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
res = isatty(self->fd);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
return PyBool_FromLong(res);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PyDoc_STRVAR(fileio_doc,
|
|
|
|
"file(name: str[, mode: str]) -> file IO object\n"
|
|
|
|
"\n"
|
|
|
|
"Open a file. The mode can be 'r', 'w' or 'a' for reading (default),\n"
|
|
|
|
"writing or appending. The file will be created if it doesn't exist\n"
|
|
|
|
"when opened for writing or appending; it will be truncated when\n"
|
|
|
|
"opened for writing. Add a '+' to the mode to allow simultaneous\n"
|
|
|
|
"reading and writing.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(read_doc,
|
|
|
|
"read(size: int) -> bytes. read at most size bytes, returned as bytes.\n"
|
|
|
|
"\n"
|
|
|
|
"Only makes one system call, so less data may be returned than requested\n"
|
|
|
|
"In non-blocking mode, returns None if no data is available.\n"
|
|
|
|
"On end-of-file, returns ''.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(readall_doc,
|
|
|
|
"readall() -> bytes. read all data from the file, returned as bytes.\n"
|
|
|
|
"\n"
|
|
|
|
"In non-blocking mode, returns as much as is immediately available,\n"
|
|
|
|
"or None if no data is available. On end-of-file, returns ''.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(write_doc,
|
|
|
|
"write(b: bytes) -> int. Write bytes b to file, return number written.\n"
|
|
|
|
"\n"
|
|
|
|
"Only makes one system call, so not all of the data may be written.\n"
|
|
|
|
"The number of bytes actually written is returned.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(fileno_doc,
|
|
|
|
"fileno() -> int. \"file descriptor\".\n"
|
|
|
|
"\n"
|
|
|
|
"This is needed for lower-level file interfaces, such the fcntl module.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(seek_doc,
|
|
|
|
"seek(offset: int[, whence: int]) -> None. Move to new file position.\n"
|
|
|
|
"\n"
|
|
|
|
"Argument offset is a byte count. Optional argument whence defaults to\n"
|
|
|
|
"0 (offset from start of file, offset should be >= 0); other values are 1\n"
|
|
|
|
"(move relative to current position, positive or negative), and 2 (move\n"
|
|
|
|
"relative to end of file, usually negative, although many platforms allow\n"
|
|
|
|
"seeking beyond the end of a file)."
|
|
|
|
"\n"
|
|
|
|
"Note that not all file objects are seekable.");
|
|
|
|
|
|
|
|
#ifdef HAVE_FTRUNCATE
|
|
|
|
PyDoc_STRVAR(truncate_doc,
|
|
|
|
"truncate([size: int]) -> None. Truncate the file to at most size bytes.\n"
|
|
|
|
"\n"
|
Backport fast alternate io.BytesIO implementation.
Merged r62778, r62779, r62802, r62806, r62807, r62808, r62809, r62844,
r62846, r62952, r62956.
2008-05-09 18:49:43 -03:00
|
|
|
"Size defaults to the current file position, as returned by tell()."
|
|
|
|
"The current file position is changed to the value of size.");
|
2008-01-25 08:18:43 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
PyDoc_STRVAR(tell_doc,
|
|
|
|
"tell() -> int. Current file position");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(readinto_doc,
|
|
|
|
"readinto() -> Undocumented. Don't use this; it may go away.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(close_doc,
|
|
|
|
"close() -> None. Close the file.\n"
|
|
|
|
"\n"
|
|
|
|
"A closed file cannot be used for further I/O operations. close() may be\n"
|
|
|
|
"called more than once without error. Changes the fileno to -1.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(isatty_doc,
|
|
|
|
"isatty() -> bool. True if the file is connected to a tty device.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(seekable_doc,
|
|
|
|
"seekable() -> bool. True if file supports random-access.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(readable_doc,
|
|
|
|
"readable() -> bool. True if file was opened in a read mode.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(writable_doc,
|
|
|
|
"writable() -> bool. True if file was opened in a write mode.");
|
|
|
|
|
|
|
|
static PyMethodDef fileio_methods[] = {
|
|
|
|
{"read", (PyCFunction)fileio_read, METH_VARARGS, read_doc},
|
|
|
|
{"readall", (PyCFunction)fileio_readall, METH_NOARGS, readall_doc},
|
|
|
|
{"readinto", (PyCFunction)fileio_readinto, METH_VARARGS, readinto_doc},
|
|
|
|
{"write", (PyCFunction)fileio_write, METH_VARARGS, write_doc},
|
|
|
|
{"seek", (PyCFunction)fileio_seek, METH_VARARGS, seek_doc},
|
|
|
|
{"tell", (PyCFunction)fileio_tell, METH_VARARGS, tell_doc},
|
|
|
|
#ifdef HAVE_FTRUNCATE
|
|
|
|
{"truncate", (PyCFunction)fileio_truncate, METH_VARARGS, truncate_doc},
|
|
|
|
#endif
|
|
|
|
{"close", (PyCFunction)fileio_close, METH_NOARGS, close_doc},
|
|
|
|
{"seekable", (PyCFunction)fileio_seekable, METH_NOARGS, seekable_doc},
|
|
|
|
{"readable", (PyCFunction)fileio_readable, METH_NOARGS, readable_doc},
|
|
|
|
{"writable", (PyCFunction)fileio_writable, METH_NOARGS, writable_doc},
|
|
|
|
{"fileno", (PyCFunction)fileio_fileno, METH_NOARGS, fileno_doc},
|
|
|
|
{"isatty", (PyCFunction)fileio_isatty, METH_NOARGS, isatty_doc},
|
|
|
|
{NULL, NULL} /* sentinel */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 'closed' and 'mode' are attributes for backwards compatibility reasons. */
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
get_closed(PyFileIOObject *self, void *closure)
|
|
|
|
{
|
|
|
|
return PyBool_FromLong((long)(self->fd < 0));
|
|
|
|
}
|
|
|
|
|
Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67245 | benjamin.peterson | 2008-11-17 23:05:19 +0100 (Mon, 17 Nov 2008) | 1 line
improve __hash__ docs
........
r67277 | skip.montanaro | 2008-11-19 04:35:41 +0100 (Wed, 19 Nov 2008) | 1 line
patch from issue 1108
........
r67289 | brett.cannon | 2008-11-19 21:29:39 +0100 (Wed, 19 Nov 2008) | 2 lines
Ignore .pyc and .pyo files.
........
r67295 | benjamin.peterson | 2008-11-20 05:05:12 +0100 (Thu, 20 Nov 2008) | 1 line
move useful sys.settrace information to the function's documentation from the debugger
........
r67301 | benjamin.peterson | 2008-11-20 22:25:31 +0100 (Thu, 20 Nov 2008) | 1 line
fix indentation and a sphinx warning
........
r67302 | benjamin.peterson | 2008-11-20 22:44:23 +0100 (Thu, 20 Nov 2008) | 1 line
oops! didn't mean to disable that test
........
r67303 | benjamin.peterson | 2008-11-20 23:06:22 +0100 (Thu, 20 Nov 2008) | 1 line
backport r67300
........
r67307 | amaury.forgeotdarc | 2008-11-21 00:34:31 +0100 (Fri, 21 Nov 2008) | 9 lines
Fixed issue #4233.
Changed semantic of _fileio.FileIO's close() method on file objects with closefd=False.
The file descriptor is still kept open but the file object behaves like a closed file.
The FileIO object also got a new readonly attribute closefd.
Approved by Barry
Backport of r67106 from the py3k branch
........
r67330 | georg.brandl | 2008-11-22 09:34:14 +0100 (Sat, 22 Nov 2008) | 2 lines
#4364: fix attribute name on ctypes object.
........
r67332 | georg.brandl | 2008-11-22 09:45:33 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix typo.
........
r67336 | georg.brandl | 2008-11-22 11:08:50 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix error about "-*-" being mandatory in coding cookies.
........
r67355 | georg.brandl | 2008-11-23 20:17:25 +0100 (Sun, 23 Nov 2008) | 2 lines
#4392: fix parameter name.
........
r67359 | georg.brandl | 2008-11-23 22:57:30 +0100 (Sun, 23 Nov 2008) | 2 lines
#4399: fix typo.
........
r67362 | gregory.p.smith | 2008-11-24 01:41:43 +0100 (Mon, 24 Nov 2008) | 2 lines
Document PY_SSIZE_T_CLEAN for PyArg_ParseTuple.
........
r67364 | benjamin.peterson | 2008-11-24 02:16:29 +0100 (Mon, 24 Nov 2008) | 2 lines
replace reference to debugger-hooks
........
r67367 | georg.brandl | 2008-11-24 17:16:07 +0100 (Mon, 24 Nov 2008) | 2 lines
Fix typo.
........
r67368 | georg.brandl | 2008-11-24 20:56:47 +0100 (Mon, 24 Nov 2008) | 2 lines
#4404: make clear what "path" is.
........
r67370 | jeremy.hylton | 2008-11-24 23:00:29 +0100 (Mon, 24 Nov 2008) | 8 lines
Add unittests that verify documented behavior of public methods in Transport
class.
These methods can be overridden. The tests verify that the overridden
methods are called, and that changes to the connection have a visible
effect on the request.
........
2008-12-05 04:51:30 -04:00
|
|
|
static PyObject *
|
|
|
|
get_closefd(PyFileIOObject *self, void *closure)
|
|
|
|
{
|
|
|
|
return PyBool_FromLong((long)(self->closefd));
|
|
|
|
}
|
|
|
|
|
2008-01-25 08:18:43 -04:00
|
|
|
static PyObject *
|
|
|
|
get_mode(PyFileIOObject *self, void *closure)
|
|
|
|
{
|
2008-06-09 01:58:54 -03:00
|
|
|
return PyString_FromString(mode_string(self));
|
2008-01-25 08:18:43 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyGetSetDef fileio_getsetlist[] = {
|
|
|
|
{"closed", (getter)get_closed, NULL, "True if the file is closed"},
|
Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67245 | benjamin.peterson | 2008-11-17 23:05:19 +0100 (Mon, 17 Nov 2008) | 1 line
improve __hash__ docs
........
r67277 | skip.montanaro | 2008-11-19 04:35:41 +0100 (Wed, 19 Nov 2008) | 1 line
patch from issue 1108
........
r67289 | brett.cannon | 2008-11-19 21:29:39 +0100 (Wed, 19 Nov 2008) | 2 lines
Ignore .pyc and .pyo files.
........
r67295 | benjamin.peterson | 2008-11-20 05:05:12 +0100 (Thu, 20 Nov 2008) | 1 line
move useful sys.settrace information to the function's documentation from the debugger
........
r67301 | benjamin.peterson | 2008-11-20 22:25:31 +0100 (Thu, 20 Nov 2008) | 1 line
fix indentation and a sphinx warning
........
r67302 | benjamin.peterson | 2008-11-20 22:44:23 +0100 (Thu, 20 Nov 2008) | 1 line
oops! didn't mean to disable that test
........
r67303 | benjamin.peterson | 2008-11-20 23:06:22 +0100 (Thu, 20 Nov 2008) | 1 line
backport r67300
........
r67307 | amaury.forgeotdarc | 2008-11-21 00:34:31 +0100 (Fri, 21 Nov 2008) | 9 lines
Fixed issue #4233.
Changed semantic of _fileio.FileIO's close() method on file objects with closefd=False.
The file descriptor is still kept open but the file object behaves like a closed file.
The FileIO object also got a new readonly attribute closefd.
Approved by Barry
Backport of r67106 from the py3k branch
........
r67330 | georg.brandl | 2008-11-22 09:34:14 +0100 (Sat, 22 Nov 2008) | 2 lines
#4364: fix attribute name on ctypes object.
........
r67332 | georg.brandl | 2008-11-22 09:45:33 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix typo.
........
r67336 | georg.brandl | 2008-11-22 11:08:50 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix error about "-*-" being mandatory in coding cookies.
........
r67355 | georg.brandl | 2008-11-23 20:17:25 +0100 (Sun, 23 Nov 2008) | 2 lines
#4392: fix parameter name.
........
r67359 | georg.brandl | 2008-11-23 22:57:30 +0100 (Sun, 23 Nov 2008) | 2 lines
#4399: fix typo.
........
r67362 | gregory.p.smith | 2008-11-24 01:41:43 +0100 (Mon, 24 Nov 2008) | 2 lines
Document PY_SSIZE_T_CLEAN for PyArg_ParseTuple.
........
r67364 | benjamin.peterson | 2008-11-24 02:16:29 +0100 (Mon, 24 Nov 2008) | 2 lines
replace reference to debugger-hooks
........
r67367 | georg.brandl | 2008-11-24 17:16:07 +0100 (Mon, 24 Nov 2008) | 2 lines
Fix typo.
........
r67368 | georg.brandl | 2008-11-24 20:56:47 +0100 (Mon, 24 Nov 2008) | 2 lines
#4404: make clear what "path" is.
........
r67370 | jeremy.hylton | 2008-11-24 23:00:29 +0100 (Mon, 24 Nov 2008) | 8 lines
Add unittests that verify documented behavior of public methods in Transport
class.
These methods can be overridden. The tests verify that the overridden
methods are called, and that changes to the connection have a visible
effect on the request.
........
2008-12-05 04:51:30 -04:00
|
|
|
{"closefd", (getter)get_closefd, NULL,
|
|
|
|
"True if the file descriptor will be closed"},
|
2008-01-25 08:18:43 -04:00
|
|
|
{"mode", (getter)get_mode, NULL, "String giving the file mode"},
|
|
|
|
{0},
|
|
|
|
};
|
|
|
|
|
|
|
|
PyTypeObject PyFileIO_Type = {
|
2008-09-23 13:11:09 -03:00
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
2008-01-25 08:18:43 -04:00
|
|
|
"_FileIO",
|
|
|
|
sizeof(PyFileIOObject),
|
|
|
|
0,
|
|
|
|
(destructor)fileio_dealloc, /* tp_dealloc */
|
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_compare */
|
|
|
|
(reprfunc)fileio_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, /* tp_flags */
|
|
|
|
fileio_doc, /* tp_doc */
|
|
|
|
0, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
offsetof(PyFileIOObject, weakreflist), /* tp_weaklistoffset */
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
fileio_methods, /* tp_methods */
|
|
|
|
0, /* tp_members */
|
|
|
|
fileio_getsetlist, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
fileio_init, /* tp_init */
|
|
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
|
|
fileio_new, /* tp_new */
|
|
|
|
PyObject_Del, /* tp_free */
|
|
|
|
};
|
|
|
|
|
|
|
|
static PyMethodDef module_methods[] = {
|
|
|
|
{NULL, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
PyMODINIT_FUNC
|
|
|
|
init_fileio(void)
|
|
|
|
{
|
|
|
|
PyObject *m; /* a module object */
|
|
|
|
|
|
|
|
m = Py_InitModule3("_fileio", module_methods,
|
|
|
|
"Fast implementation of io.FileIO.");
|
|
|
|
if (m == NULL)
|
|
|
|
return;
|
|
|
|
if (PyType_Ready(&PyFileIO_Type) < 0)
|
|
|
|
return;
|
|
|
|
Py_INCREF(&PyFileIO_Type);
|
|
|
|
PyModule_AddObject(m, "_FileIO", (PyObject *) &PyFileIO_Type);
|
|
|
|
}
|