summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorJeremy Hylton <jeremy@alum.mit.edu>2001-02-09 23:44:22 (GMT)
committerJeremy Hylton <jeremy@alum.mit.edu>2001-02-09 23:44:22 (GMT)
commitcafd495dfed238afdf684ec1cede705bd93bfb5b (patch)
tree6ed921517d19e5dbca8bac1642521086aaf285b4 /Modules
parent6f8ee59653261731d73f0e16bd3f667db57133bd (diff)
downloadcpython-cafd495dfed238afdf684ec1cede705bd93bfb5b.zip
cpython-cafd495dfed238afdf684ec1cede705bd93bfb5b.tar.gz
cpython-cafd495dfed238afdf684ec1cede705bd93bfb5b.tar.bz2
In O_writelines: Replace use of string.joinfields with "".join.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/cStringIO.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/Modules/cStringIO.c b/Modules/cStringIO.c
index 1cb40ea..ddf3699 100644
--- a/Modules/cStringIO.c
+++ b/Modules/cStringIO.c
@@ -460,20 +460,23 @@ static char O_writelines__doc__[] =
static PyObject *
O_writelines(Oobject *self, PyObject *args) {
PyObject *tmp = 0;
- static PyObject *string_joinfields = 0;
+ static PyObject *joiner = NULL;
UNLESS (PyArg_ParseTuple(args, "O:writelines", &args)) return NULL;
- if (!string_joinfields) {
- UNLESS (tmp = PyImport_ImportModule("string")) return NULL;
- string_joinfields=PyObject_GetAttrString(tmp, "joinfields");
- Py_DECREF(tmp);
- UNLESS (string_joinfields) return NULL;
- }
+ if (!joiner) {
+ PyObject *empty_string = PyString_FromString("");
+ if (empty_string == NULL)
+ return NULL;
+ joiner = PyObject_GetAttrString(empty_string, "join");
+ Py_DECREF(empty_string);
+ if (joiner == NULL)
+ return NULL;
+ }
if (PyObject_Size(args) < 0) return NULL;
- tmp = PyObject_CallFunction(string_joinfields, "Os", args, "");
+ tmp = PyObject_CallFunction(joiner, "O", args);
UNLESS (tmp) return NULL;
args = Py_BuildValue("(O)", tmp);