summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-11-12 02:27:16 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2017-11-12 02:27:16 +0100
commitc11c6ab12886283200b0ae5897d12fe64255a824 (patch)
tree7a9abb195a63a2a6e3ab90b06ed3364bb5da5f40
parentd32973d145bd50f22407d4b8d936f1da6be7313c (diff)
downloadpsutil-c11c6ab12886283200b0ae5897d12fe64255a824.tar.gz
rename C func
-rw-r--r--psutil/_psutil_common.c2
-rw-r--r--psutil/_psutil_common.h3
-rw-r--r--psutil/arch/windows/process_info.c4
3 files changed, 4 insertions, 5 deletions
diff --git a/psutil/_psutil_common.c b/psutil/_psutil_common.c
index 694aa147..499925cd 100644
--- a/psutil/_psutil_common.c
+++ b/psutil/_psutil_common.c
@@ -45,7 +45,7 @@ static int _psutil_testing = -1;
* enabled with psutil_set_testing.
*/
int
-psutil_testing(void) {
+psutil_is_testing(void) {
if (_psutil_testing == -1) {
if (getenv("PSUTIL_TESTING") != NULL)
_psutil_testing = 1;
diff --git a/psutil/_psutil_common.h b/psutil/_psutil_common.h
index 0b606698..c76b1ecd 100644
--- a/psutil/_psutil_common.h
+++ b/psutil/_psutil_common.h
@@ -11,8 +11,7 @@ static const int PSUTIL_CONN_NONE = 128;
PyObject* AccessDenied(void);
PyObject* NoSuchProcess(void);
-int psutil_testing(void);
-PyObject* py_psutil_is_testing(PyObject *self, PyObject *args);
+int psutil_is_testing(void);
PyObject* psutil_set_testing(PyObject *self, PyObject *args);
#if PY_MAJOR_VERSION < 3
PyObject* PyUnicode_DecodeFSDefault(char *s);
diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/process_info.c
index a9687f9c..c7410a18 100644
--- a/psutil/arch/windows/process_info.c
+++ b/psutil/arch/windows/process_info.c
@@ -337,7 +337,7 @@ psutil_get_pids(DWORD *numberOfReturnedPIDs) {
int
psutil_assert_pid_exists(DWORD pid, char *err) {
- if (psutil_testing()) {
+ if (psutil_is_testing()) {
if (psutil_pid_in_pids(pid) == 0) {
PyErr_SetString(PyExc_AssertionError, err);
return 0;
@@ -349,7 +349,7 @@ psutil_assert_pid_exists(DWORD pid, char *err) {
int
psutil_assert_pid_not_exists(DWORD pid, char *err) {
- if (psutil_testing()) {
+ if (psutil_is_testing()) {
if (psutil_pid_in_pids(pid) == 1) {
PyErr_SetString(PyExc_AssertionError, err);
return 0;