Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c
index 6908eb8..215a1fa 100644
--- a/Objects/bytes_methods.c
+++ b/Objects/bytes_methods.c
@@ -24,7 +24,7 @@
e = p + len;
for (; p < e; p++) {
- if (!Py_ISSPACE(*p))
+ if (!Py_ISSPACE(*p))
Py_RETURN_FALSE;
}
Py_RETURN_TRUE;
@@ -46,16 +46,16 @@
/* Shortcut for single character strings */
if (len == 1 && Py_ISALPHA(*p))
- Py_RETURN_TRUE;
+ Py_RETURN_TRUE;
/* Special case for empty strings */
if (len == 0)
- Py_RETURN_FALSE;
+ Py_RETURN_FALSE;
e = p + len;
for (; p < e; p++) {
- if (!Py_ISALPHA(*p))
- Py_RETURN_FALSE;
+ if (!Py_ISALPHA(*p))
+ Py_RETURN_FALSE;
}
Py_RETURN_TRUE;
}
@@ -76,16 +76,16 @@
/* Shortcut for single character strings */
if (len == 1 && Py_ISALNUM(*p))
- Py_RETURN_TRUE;
+ Py_RETURN_TRUE;
/* Special case for empty strings */
if (len == 0)
- Py_RETURN_FALSE;
+ Py_RETURN_FALSE;
e = p + len;
for (; p < e; p++) {
- if (!Py_ISALNUM(*p))
- Py_RETURN_FALSE;
+ if (!Py_ISALNUM(*p))
+ Py_RETURN_FALSE;
}
Py_RETURN_TRUE;
}
@@ -106,16 +106,16 @@
/* Shortcut for single character strings */
if (len == 1 && Py_ISDIGIT(*p))
- Py_RETURN_TRUE;
+ Py_RETURN_TRUE;
/* Special case for empty strings */
if (len == 0)
- Py_RETURN_FALSE;
+ Py_RETURN_FALSE;
e = p + len;
for (; p < e; p++) {
- if (!Py_ISDIGIT(*p))
- Py_RETURN_FALSE;
+ if (!Py_ISDIGIT(*p))
+ Py_RETURN_FALSE;
}
Py_RETURN_TRUE;
}
@@ -137,19 +137,19 @@
/* Shortcut for single character strings */
if (len == 1)
- return PyBool_FromLong(Py_ISLOWER(*p));
+ return PyBool_FromLong(Py_ISLOWER(*p));
/* Special case for empty strings */
if (len == 0)
- Py_RETURN_FALSE;
+ Py_RETURN_FALSE;
e = p + len;
cased = 0;
for (; p < e; p++) {
- if (Py_ISUPPER(*p))
- Py_RETURN_FALSE;
- else if (!cased && Py_ISLOWER(*p))
- cased = 1;
+ if (Py_ISUPPER(*p))
+ Py_RETURN_FALSE;
+ else if (!cased && Py_ISLOWER(*p))
+ cased = 1;
}
return PyBool_FromLong(cased);
}
@@ -171,19 +171,19 @@
/* Shortcut for single character strings */
if (len == 1)
- return PyBool_FromLong(Py_ISUPPER(*p));
+ return PyBool_FromLong(Py_ISUPPER(*p));
/* Special case for empty strings */
if (len == 0)
- Py_RETURN_FALSE;
+ Py_RETURN_FALSE;
e = p + len;
cased = 0;
for (; p < e; p++) {
- if (Py_ISLOWER(*p))
- Py_RETURN_FALSE;
- else if (!cased && Py_ISUPPER(*p))
- cased = 1;
+ if (Py_ISLOWER(*p))
+ Py_RETURN_FALSE;
+ else if (!cased && Py_ISUPPER(*p))
+ cased = 1;
}
return PyBool_FromLong(cased);
}
@@ -207,32 +207,32 @@
/* Shortcut for single character strings */
if (len == 1)
- return PyBool_FromLong(Py_ISUPPER(*p));
+ return PyBool_FromLong(Py_ISUPPER(*p));
/* Special case for empty strings */
if (len == 0)
- Py_RETURN_FALSE;
+ Py_RETURN_FALSE;
e = p + len;
cased = 0;
previous_is_cased = 0;
for (; p < e; p++) {
- register const unsigned char ch = *p;
+ register const unsigned char ch = *p;
- if (Py_ISUPPER(ch)) {
- if (previous_is_cased)
- Py_RETURN_FALSE;
- previous_is_cased = 1;
- cased = 1;
- }
- else if (Py_ISLOWER(ch)) {
- if (!previous_is_cased)
- Py_RETURN_FALSE;
- previous_is_cased = 1;
- cased = 1;
- }
- else
- previous_is_cased = 0;
+ if (Py_ISUPPER(ch)) {
+ if (previous_is_cased)
+ Py_RETURN_FALSE;
+ previous_is_cased = 1;
+ cased = 1;
+ }
+ else if (Py_ISLOWER(ch)) {
+ if (!previous_is_cased)
+ Py_RETURN_FALSE;
+ previous_is_cased = 1;
+ cased = 1;
+ }
+ else
+ previous_is_cased = 0;
}
return PyBool_FromLong(cased);
}
@@ -246,23 +246,23 @@
void
_Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len)
{
- Py_ssize_t i;
+ Py_ssize_t i;
/*
- newobj = PyBytes_FromStringAndSize(NULL, len);
- if (!newobj)
- return NULL;
+ newobj = PyBytes_FromStringAndSize(NULL, len);
+ if (!newobj)
+ return NULL;
- s = PyBytes_AS_STRING(newobj);
+ s = PyBytes_AS_STRING(newobj);
*/
- Py_MEMCPY(result, cptr, len);
+ Py_MEMCPY(result, cptr, len);
- for (i = 0; i < len; i++) {
- int c = Py_CHARMASK(result[i]);
- if (Py_ISUPPER(c))
- result[i] = Py_TOLOWER(c);
- }
+ for (i = 0; i < len; i++) {
+ int c = Py_CHARMASK(result[i]);
+ if (Py_ISUPPER(c))
+ result[i] = Py_TOLOWER(c);
+ }
}
@@ -274,23 +274,23 @@
void
_Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len)
{
- Py_ssize_t i;
+ Py_ssize_t i;
/*
- newobj = PyBytes_FromStringAndSize(NULL, len);
- if (!newobj)
- return NULL;
+ newobj = PyBytes_FromStringAndSize(NULL, len);
+ if (!newobj)
+ return NULL;
- s = PyBytes_AS_STRING(newobj);
+ s = PyBytes_AS_STRING(newobj);
*/
- Py_MEMCPY(result, cptr, len);
+ Py_MEMCPY(result, cptr, len);
- for (i = 0; i < len; i++) {
- int c = Py_CHARMASK(result[i]);
- if (Py_ISLOWER(c))
- result[i] = Py_TOUPPER(c);
- }
+ for (i = 0; i < len; i++) {
+ int c = Py_CHARMASK(result[i]);
+ if (Py_ISLOWER(c))
+ result[i] = Py_TOUPPER(c);
+ }
}
@@ -303,29 +303,29 @@
void
_Py_bytes_title(char *result, char *s, Py_ssize_t len)
{
- Py_ssize_t i;
- int previous_is_cased = 0;
+ Py_ssize_t i;
+ int previous_is_cased = 0;
/*
- newobj = PyBytes_FromStringAndSize(NULL, len);
- if (newobj == NULL)
- return NULL;
- s_new = PyBytes_AsString(newobj);
+ newobj = PyBytes_FromStringAndSize(NULL, len);
+ if (newobj == NULL)
+ return NULL;
+ s_new = PyBytes_AsString(newobj);
*/
- for (i = 0; i < len; i++) {
- int c = Py_CHARMASK(*s++);
- if (Py_ISLOWER(c)) {
- if (!previous_is_cased)
- c = Py_TOUPPER(c);
- previous_is_cased = 1;
- } else if (Py_ISUPPER(c)) {
- if (previous_is_cased)
- c = Py_TOLOWER(c);
- previous_is_cased = 1;
- } else
- previous_is_cased = 0;
- *result++ = c;
- }
+ for (i = 0; i < len; i++) {
+ int c = Py_CHARMASK(*s++);
+ if (Py_ISLOWER(c)) {
+ if (!previous_is_cased)
+ c = Py_TOUPPER(c);
+ previous_is_cased = 1;
+ } else if (Py_ISUPPER(c)) {
+ if (previous_is_cased)
+ c = Py_TOLOWER(c);
+ previous_is_cased = 1;
+ } else
+ previous_is_cased = 0;
+ *result++ = c;
+ }
}
@@ -337,30 +337,30 @@
void
_Py_bytes_capitalize(char *result, char *s, Py_ssize_t len)
{
- Py_ssize_t i;
+ Py_ssize_t i;
/*
- newobj = PyBytes_FromStringAndSize(NULL, len);
- if (newobj == NULL)
- return NULL;
- s_new = PyBytes_AsString(newobj);
+ newobj = PyBytes_FromStringAndSize(NULL, len);
+ if (newobj == NULL)
+ return NULL;
+ s_new = PyBytes_AsString(newobj);
*/
- if (0 < len) {
- int c = Py_CHARMASK(*s++);
- if (Py_ISLOWER(c))
- *result = Py_TOUPPER(c);
- else
- *result = c;
- result++;
- }
- for (i = 1; i < len; i++) {
- int c = Py_CHARMASK(*s++);
- if (Py_ISUPPER(c))
- *result = Py_TOLOWER(c);
- else
- *result = c;
- result++;
- }
+ if (0 < len) {
+ int c = Py_CHARMASK(*s++);
+ if (Py_ISLOWER(c))
+ *result = Py_TOUPPER(c);
+ else
+ *result = c;
+ result++;
+ }
+ for (i = 1; i < len; i++) {
+ int c = Py_CHARMASK(*s++);
+ if (Py_ISUPPER(c))
+ *result = Py_TOLOWER(c);
+ else
+ *result = c;
+ result++;
+ }
}
@@ -373,26 +373,26 @@
void
_Py_bytes_swapcase(char *result, char *s, Py_ssize_t len)
{
- Py_ssize_t i;
+ Py_ssize_t i;
/*
- newobj = PyBytes_FromStringAndSize(NULL, len);
- if (newobj == NULL)
- return NULL;
- s_new = PyBytes_AsString(newobj);
+ newobj = PyBytes_FromStringAndSize(NULL, len);
+ if (newobj == NULL)
+ return NULL;
+ s_new = PyBytes_AsString(newobj);
*/
- for (i = 0; i < len; i++) {
- int c = Py_CHARMASK(*s++);
- if (Py_ISLOWER(c)) {
- *result = Py_TOUPPER(c);
- }
- else if (Py_ISUPPER(c)) {
- *result = Py_TOLOWER(c);
- }
- else
- *result = c;
- result++;
- }
+ for (i = 0; i < len; i++) {
+ int c = Py_CHARMASK(*s++);
+ if (Py_ISLOWER(c)) {
+ *result = Py_TOUPPER(c);
+ }
+ else if (Py_ISUPPER(c)) {
+ *result = Py_TOLOWER(c);
+ }
+ else
+ *result = c;
+ result++;
+ }
}
@@ -425,40 +425,40 @@
PyObject *
_Py_bytes_maketrans(PyObject *args)
{
- PyObject *frm, *to, *res = NULL;
- Py_buffer bfrm, bto;
- Py_ssize_t i;
- char *p;
+ PyObject *frm, *to, *res = NULL;
+ Py_buffer bfrm, bto;
+ Py_ssize_t i;
+ char *p;
- bfrm.len = -1;
- bto.len = -1;
-
- if (!PyArg_ParseTuple(args, "OO:maketrans", &frm, &to))
- return NULL;
- if (_getbuffer(frm, &bfrm) < 0)
- return NULL;
- if (_getbuffer(to, &bto) < 0)
- goto done;
- if (bfrm.len != bto.len) {
- PyErr_Format(PyExc_ValueError,
- "maketrans arguments must have same length");
- goto done;
- }
- res = PyBytes_FromStringAndSize(NULL, 256);
- if (!res) {
- goto done;
- }
- p = PyBytes_AS_STRING(res);
- for (i = 0; i < 256; i++)
- p[i] = i;
- for (i = 0; i < bfrm.len; i++) {
- p[((unsigned char *)bfrm.buf)[i]] = ((char *)bto.buf)[i];
- }
+ bfrm.len = -1;
+ bto.len = -1;
+
+ if (!PyArg_ParseTuple(args, "OO:maketrans", &frm, &to))
+ return NULL;
+ if (_getbuffer(frm, &bfrm) < 0)
+ return NULL;
+ if (_getbuffer(to, &bto) < 0)
+ goto done;
+ if (bfrm.len != bto.len) {
+ PyErr_Format(PyExc_ValueError,
+ "maketrans arguments must have same length");
+ goto done;
+ }
+ res = PyBytes_FromStringAndSize(NULL, 256);
+ if (!res) {
+ goto done;
+ }
+ p = PyBytes_AS_STRING(res);
+ for (i = 0; i < 256; i++)
+ p[i] = i;
+ for (i = 0; i < bfrm.len; i++) {
+ p[((unsigned char *)bfrm.buf)[i]] = ((char *)bto.buf)[i];
+ }
done:
- if (bfrm.len != -1)
- PyBuffer_Release(&bfrm);
- if (bto.len != -1)
- PyBuffer_Release(&bto);
- return res;
+ if (bfrm.len != -1)
+ PyBuffer_Release(&bfrm);
+ if (bto.len != -1)
+ PyBuffer_Release(&bto);
+ return res;
}