Skip to content

Use Py_RETURN_FALSE/Py_RETURN_TRUE rather than PyBool_FromLong(0)/PyB… #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
Mar 8, 2017
Merged

Use Py_RETURN_FALSE/Py_RETURN_TRUE rather than PyBool_FromLong(0)/PyB… #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11748,14 +11748,14 @@ unicode_islower_impl(PyObject *self)

/* Special case for empty strings */
if (length == 0)
return PyBool_FromLong(0);
Py_RETURN_FALSE;

cased = 0;
for (i = 0; i < length; i++) {
const Py_UCS4 ch = PyUnicode_READ(kind, data, i);

if (Py_UNICODE_ISUPPER(ch) || Py_UNICODE_ISTITLE(ch))
return PyBool_FromLong(0);
Py_RETURN_FALSE;
else if (!cased && Py_UNICODE_ISLOWER(ch))
cased = 1;
}
Expand Down Expand Up @@ -11793,14 +11793,14 @@ unicode_isupper_impl(PyObject *self)

/* Special case for empty strings */
if (length == 0)
return PyBool_FromLong(0);
Py_RETURN_FALSE;

cased = 0;
for (i = 0; i < length; i++) {
const Py_UCS4 ch = PyUnicode_READ(kind, data, i);

if (Py_UNICODE_ISLOWER(ch) || Py_UNICODE_ISTITLE(ch))
return PyBool_FromLong(0);
Py_RETURN_FALSE;
else if (!cased && Py_UNICODE_ISUPPER(ch))
cased = 1;
}
Expand Down Expand Up @@ -11840,7 +11840,7 @@ unicode_istitle_impl(PyObject *self)

/* Special case for empty strings */
if (length == 0)
return PyBool_FromLong(0);
Py_RETURN_FALSE;

cased = 0;
previous_is_cased = 0;
Expand All @@ -11849,13 +11849,13 @@ unicode_istitle_impl(PyObject *self)

if (Py_UNICODE_ISUPPER(ch) || Py_UNICODE_ISTITLE(ch)) {
if (previous_is_cased)
return PyBool_FromLong(0);
Py_RETURN_FALSE;
previous_is_cased = 1;
cased = 1;
}
else if (Py_UNICODE_ISLOWER(ch)) {
if (!previous_is_cased)
return PyBool_FromLong(0);
Py_RETURN_FALSE;
previous_is_cased = 1;
cased = 1;
}
Expand Down Expand Up @@ -11895,14 +11895,14 @@ unicode_isspace_impl(PyObject *self)

/* Special case for empty strings */
if (length == 0)
return PyBool_FromLong(0);
Py_RETURN_FALSE;

for (i = 0; i < length; i++) {
const Py_UCS4 ch = PyUnicode_READ(kind, data, i);
if (!Py_UNICODE_ISSPACE(ch))
return PyBool_FromLong(0);
Py_RETURN_FALSE;
}
return PyBool_FromLong(1);
Py_RETURN_TRUE;
}

/*[clinic input]
Expand Down Expand Up @@ -11935,13 +11935,13 @@ unicode_isalpha_impl(PyObject *self)

/* Special case for empty strings */
if (length == 0)
return PyBool_FromLong(0);
Py_RETURN_FALSE;

for (i = 0; i < length; i++) {
if (!Py_UNICODE_ISALPHA(PyUnicode_READ(kind, data, i)))
return PyBool_FromLong(0);
Py_RETURN_FALSE;
}
return PyBool_FromLong(1);
Py_RETURN_TRUE;
}

/*[clinic input]
Expand Down Expand Up @@ -11976,14 +11976,14 @@ unicode_isalnum_impl(PyObject *self)

/* Special case for empty strings */
if (len == 0)
return PyBool_FromLong(0);
Py_RETURN_FALSE;

for (i = 0; i < len; i++) {
const Py_UCS4 ch = PyUnicode_READ(kind, data, i);
if (!Py_UNICODE_ISALNUM(ch))
return PyBool_FromLong(0);
Py_RETURN_FALSE;
}
return PyBool_FromLong(1);
Py_RETURN_TRUE;
}

/*[clinic input]
Expand Down Expand Up @@ -12016,13 +12016,13 @@ unicode_isdecimal_impl(PyObject *self)

/* Special case for empty strings */
if (length == 0)
return PyBool_FromLong(0);
Py_RETURN_FALSE;

for (i = 0; i < length; i++) {
if (!Py_UNICODE_ISDECIMAL(PyUnicode_READ(kind, data, i)))
return PyBool_FromLong(0);
Py_RETURN_FALSE;
}
return PyBool_FromLong(1);
Py_RETURN_TRUE;
}

/*[clinic input]
Expand Down Expand Up @@ -12056,13 +12056,13 @@ unicode_isdigit_impl(PyObject *self)

/* Special case for empty strings */
if (length == 0)
return PyBool_FromLong(0);
Py_RETURN_FALSE;

for (i = 0; i < length; i++) {
if (!Py_UNICODE_ISDIGIT(PyUnicode_READ(kind, data, i)))
return PyBool_FromLong(0);
Py_RETURN_FALSE;
}
return PyBool_FromLong(1);
Py_RETURN_TRUE;
}

/*[clinic input]
Expand Down Expand Up @@ -12095,13 +12095,13 @@ unicode_isnumeric_impl(PyObject *self)

/* Special case for empty strings */
if (length == 0)
return PyBool_FromLong(0);
Py_RETURN_FALSE;

for (i = 0; i < length; i++) {
if (!Py_UNICODE_ISNUMERIC(PyUnicode_READ(kind, data, i)))
return PyBool_FromLong(0);
Py_RETURN_FALSE;
}
return PyBool_FromLong(1);
Py_RETURN_TRUE;
}

int
Expand Down
2 changes: 1 addition & 1 deletion Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ _imp_lock_held_impl(PyObject *module)
#ifdef WITH_THREAD
return PyBool_FromLong(import_lock_thread != -1);
#else
return PyBool_FromLong(0);
Py_RETURN_FALSE;
#endif
}

Expand Down