comparison Python/sysmodule.c @ 44099:f324631462a2

Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h
author Christian Heimes <christian@cheimes.de>
date Sun, 02 Dec 2007 14:31:20 +0000
parents 0889daf6d0d9
children 9d152530910a
comparison
equal deleted inserted replaced
44098:0889daf6d0d9 44099:f324631462a2
409 ); 409 );
410 410
411 static PyObject * 411 static PyObject *
412 sys_getcheckinterval(PyObject *self, PyObject *args) 412 sys_getcheckinterval(PyObject *self, PyObject *args)
413 { 413 {
414 return PyInt_FromLong(_Py_CheckInterval); 414 return PyLong_FromLong(_Py_CheckInterval);
415 } 415 }
416 416
417 PyDoc_STRVAR(getcheckinterval_doc, 417 PyDoc_STRVAR(getcheckinterval_doc,
418 "getcheckinterval() -> current check interval; see setcheckinterval()." 418 "getcheckinterval() -> current check interval; see setcheckinterval()."
419 ); 419 );
471 ); 471 );
472 472
473 static PyObject * 473 static PyObject *
474 sys_getrecursionlimit(PyObject *self) 474 sys_getrecursionlimit(PyObject *self)
475 { 475 {
476 return PyInt_FromLong(Py_GetRecursionLimit()); 476 return PyLong_FromLong(Py_GetRecursionLimit());
477 } 477 }
478 478
479 PyDoc_STRVAR(getrecursionlimit_doc, 479 PyDoc_STRVAR(getrecursionlimit_doc,
480 "getrecursionlimit()\n\ 480 "getrecursionlimit()\n\
481 \n\ 481 \n\
541 sys_getdlopenflags(PyObject *self, PyObject *args) 541 sys_getdlopenflags(PyObject *self, PyObject *args)
542 { 542 {
543 PyThreadState *tstate = PyThreadState_GET(); 543 PyThreadState *tstate = PyThreadState_GET();
544 if (!tstate) 544 if (!tstate)
545 return NULL; 545 return NULL;
546 return PyInt_FromLong(tstate->interp->dlopenflags); 546 return PyLong_FromLong(tstate->interp->dlopenflags);
547 } 547 }
548 548
549 PyDoc_STRVAR(getdlopenflags_doc, 549 PyDoc_STRVAR(getdlopenflags_doc,
550 "getdlopenflags() -> int\n\ 550 "getdlopenflags() -> int\n\
551 \n\ 551 \n\
571 #endif /* USE_MALLOPT */ 571 #endif /* USE_MALLOPT */
572 572
573 static PyObject * 573 static PyObject *
574 sys_getrefcount(PyObject *self, PyObject *arg) 574 sys_getrefcount(PyObject *self, PyObject *arg)
575 { 575 {
576 return PyInt_FromSsize_t(arg->ob_refcnt); 576 return PyLong_FromSsize_t(arg->ob_refcnt);
577 } 577 }
578 578
579 #ifdef Py_REF_DEBUG 579 #ifdef Py_REF_DEBUG
580 static PyObject * 580 static PyObject *
581 sys_gettotalrefcount(PyObject *self) 581 sys_gettotalrefcount(PyObject *self)
582 { 582 {
583 return PyInt_FromSsize_t(_Py_GetRefTotal()); 583 return PyLong_FromSsize_t(_Py_GetRefTotal());
584 } 584 }
585 #endif /* Py_REF_DEBUG */ 585 #endif /* Py_REF_DEBUG */
586 586
587 PyDoc_STRVAR(getrefcount_doc, 587 PyDoc_STRVAR(getrefcount_doc,
588 "getrefcount(object) -> integer\n\ 588 "getrefcount(object) -> integer\n\
1032 PyDict_GetItemString(sysdict, "excepthook")); 1032 PyDict_GetItemString(sysdict, "excepthook"));
1033 PyDict_SetItemString(sysdict, "version", 1033 PyDict_SetItemString(sysdict, "version",
1034 v = PyUnicode_FromString(Py_GetVersion())); 1034 v = PyUnicode_FromString(Py_GetVersion()));
1035 Py_XDECREF(v); 1035 Py_XDECREF(v);
1036 PyDict_SetItemString(sysdict, "hexversion", 1036 PyDict_SetItemString(sysdict, "hexversion",
1037 v = PyInt_FromLong(PY_VERSION_HEX)); 1037 v = PyLong_FromLong(PY_VERSION_HEX));
1038 Py_XDECREF(v); 1038 Py_XDECREF(v);
1039 svnversion_init(); 1039 svnversion_init();
1040 v = Py_BuildValue("(UUU)", "CPython", branch, svn_revision); 1040 v = Py_BuildValue("(UUU)", "CPython", branch, svn_revision);
1041 PyDict_SetItemString(sysdict, "subversion", v); 1041 PyDict_SetItemString(sysdict, "subversion", v);
1042 Py_XDECREF(v); 1042 Py_XDECREF(v);
1064 Py_BuildValue("iiiUi", PY_MAJOR_VERSION, 1064 Py_BuildValue("iiiUi", PY_MAJOR_VERSION,
1065 PY_MINOR_VERSION, 1065 PY_MINOR_VERSION,
1066 PY_MICRO_VERSION, s, 1066 PY_MICRO_VERSION, s,
1067 PY_RELEASE_SERIAL)); 1067 PY_RELEASE_SERIAL));
1068 SET_SYS_FROM_STRING("api_version", 1068 SET_SYS_FROM_STRING("api_version",
1069 PyInt_FromLong(PYTHON_API_VERSION)); 1069 PyLong_FromLong(PYTHON_API_VERSION));
1070 SET_SYS_FROM_STRING("copyright", 1070 SET_SYS_FROM_STRING("copyright",
1071 PyUnicode_FromString(Py_GetCopyright())); 1071 PyUnicode_FromString(Py_GetCopyright()));
1072 SET_SYS_FROM_STRING("platform", 1072 SET_SYS_FROM_STRING("platform",
1073 PyUnicode_FromString(Py_GetPlatform())); 1073 PyUnicode_FromString(Py_GetPlatform()));
1074 SET_SYS_FROM_STRING("executable", 1074 SET_SYS_FROM_STRING("executable",
1077 SET_SYS_FROM_STRING("prefix", 1077 SET_SYS_FROM_STRING("prefix",
1078 PyUnicode_DecodeFSDefault(Py_GetPrefix())); 1078 PyUnicode_DecodeFSDefault(Py_GetPrefix()));
1079 SET_SYS_FROM_STRING("exec_prefix", 1079 SET_SYS_FROM_STRING("exec_prefix",
1080 PyUnicode_DecodeFSDefault(Py_GetExecPrefix())); 1080 PyUnicode_DecodeFSDefault(Py_GetExecPrefix()));
1081 SET_SYS_FROM_STRING("maxint", 1081 SET_SYS_FROM_STRING("maxint",
1082 PyInt_FromLong(PyInt_GetMax())); 1082 PyLong_FromLong(PyInt_GetMax()));
1083 SET_SYS_FROM_STRING("maxsize", 1083 SET_SYS_FROM_STRING("maxsize",
1084 PyInt_FromSsize_t(PY_SSIZE_T_MAX)); 1084 PyLong_FromSsize_t(PY_SSIZE_T_MAX));
1085 SET_SYS_FROM_STRING("float_info", 1085 SET_SYS_FROM_STRING("float_info",
1086 PyFloat_GetInfo()); 1086 PyFloat_GetInfo());
1087 SET_SYS_FROM_STRING("maxunicode", 1087 SET_SYS_FROM_STRING("maxunicode",
1088 PyInt_FromLong(PyUnicode_GetMax())); 1088 PyLong_FromLong(PyUnicode_GetMax()));
1089 SET_SYS_FROM_STRING("builtin_module_names", 1089 SET_SYS_FROM_STRING("builtin_module_names",
1090 list_builtin_module_names()); 1090 list_builtin_module_names());
1091 { 1091 {
1092 /* Assumes that longs are at least 2 bytes long. 1092 /* Assumes that longs are at least 2 bytes long.
1093 Should be safe! */ 1093 Should be safe! */