diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-05-02 04:43:14 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-05-02 04:43:14 (GMT) |
| commit | c4edb0ec81f437b84a4011e3a375892d48d0bd6c (patch) | |
| tree | df542d1d9c5d89d5555d7cda6026628f2139f05f /Python/bltinmodule.c | |
| parent | 4bbf66e852e2e812b4ef0fa774ff8614c96a0b82 (diff) | |
| download | cpython-c4edb0ec81f437b84a4011e3a375892d48d0bd6c.zip cpython-c4edb0ec81f437b84a4011e3a375892d48d0bd6c.tar.gz cpython-c4edb0ec81f437b84a4011e3a375892d48d0bd6c.tar.bz2 | |
SF #1479181: split open() and file() from being aliases for each other.
Diffstat (limited to 'Python/bltinmodule.c')
| -rw-r--r-- | Python/bltinmodule.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 27b4811..6fcc05e 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1342,6 +1342,18 @@ Return the octal representation of an integer or long integer."); static PyObject * +builtin_open(PyObject *self, PyObject *args, PyObject *kwds) +{ + return PyObject_Call((PyObject*)&PyFile_Type, args, kwds); +} + +PyDoc_STRVAR(open_doc, +"open(name[, mode[, buffering]]) -> file object\n\ +\n\ +Open a file using the file() type, returns a file object."); + + +static PyObject * builtin_ord(PyObject *self, PyObject* obj) { long ord; @@ -2247,6 +2259,7 @@ static PyMethodDef builtin_methods[] = { {"max", (PyCFunction)builtin_max, METH_VARARGS | METH_KEYWORDS, max_doc}, {"min", (PyCFunction)builtin_min, METH_VARARGS | METH_KEYWORDS, min_doc}, {"oct", builtin_oct, METH_O, oct_doc}, + {"open", (PyCFunction)builtin_open, METH_VARARGS | METH_KEYWORDS, open_doc}, {"ord", builtin_ord, METH_O, ord_doc}, {"pow", builtin_pow, METH_VARARGS, pow_doc}, {"range", builtin_range, METH_VARARGS, range_doc}, @@ -2313,6 +2326,7 @@ _PyBuiltin_Init(void) #endif SETBUILTIN("dict", &PyDict_Type); SETBUILTIN("enumerate", &PyEnum_Type); + SETBUILTIN("file", &PyFile_Type); SETBUILTIN("float", &PyFloat_Type); SETBUILTIN("frozenset", &PyFrozenSet_Type); SETBUILTIN("property", &PyProperty_Type); @@ -2329,10 +2343,6 @@ _PyBuiltin_Init(void) SETBUILTIN("tuple", &PyTuple_Type); SETBUILTIN("type", &PyType_Type); SETBUILTIN("xrange", &PyRange_Type); - - /* Note that open() is just an alias of file(). */ - SETBUILTIN("open", &PyFile_Type); - SETBUILTIN("file", &PyFile_Type); #ifdef Py_USING_UNICODE SETBUILTIN("unicode", &PyUnicode_Type); #endif |