diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-04-21 01:08:18 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-04-21 01:08:18 (GMT) |
commit | 5263c13801b6e1d7602887e86745fe680ad8764c (patch) | |
tree | 929c4334f0802efa3be8c1a2f95b0f0505b1f077 /Objects/stringlib | |
parent | 38bae2d7f19157c398248ccc8eb188aad028e885 (diff) | |
parent | 6b02772c13000af7065cf774a04a0e6c76cb1238 (diff) | |
download | cpython-5263c13801b6e1d7602887e86745fe680ad8764c.zip cpython-5263c13801b6e1d7602887e86745fe680ad8764c.tar.gz cpython-5263c13801b6e1d7602887e86745fe680ad8764c.tar.bz2 |
Merge removal of trailing whitespace from 3.3.
Diffstat (limited to 'Objects/stringlib')
-rw-r--r-- | Objects/stringlib/transmogrify.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Objects/stringlib/transmogrify.h b/Objects/stringlib/transmogrify.h index 1e132e5..90fa129 100644 --- a/Objects/stringlib/transmogrify.h +++ b/Objects/stringlib/transmogrify.h @@ -18,10 +18,10 @@ stringlib_expandtabs(PyObject *self, PyObject *args) size_t i, j; PyObject *u; int tabsize = 8; - + if (!PyArg_ParseTuple(args, "|i:expandtabs", &tabsize)) return NULL; - + /* First pass: determine size of output string */ i = j = 0; e = STRINGLIB_STR(self) + STRINGLIB_LEN(self); @@ -48,20 +48,20 @@ stringlib_expandtabs(PyObject *self, PyObject *args) } } } - + if ((i + j) > PY_SSIZE_T_MAX) { PyErr_SetString(PyExc_OverflowError, "result is too long"); return NULL; } - + /* Second pass: create output string and fill it */ u = STRINGLIB_NEW(NULL, i + j); if (!u) return NULL; - + j = 0; q = STRINGLIB_STR(u); - + for (p = STRINGLIB_STR(self); p < e; p++) if (*p == '\t') { if (tabsize > 0) { @@ -77,7 +77,7 @@ stringlib_expandtabs(PyObject *self, PyObject *args) if (*p == '\n' || *p == '\r') j = 0; } - + return u; } |